[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-client-cvs
Subject:    [Client-cvs] encodesvc/engine/encsession settingsadvisor.cpp,
From:       vtyagi () helixcommunity ! org
Date:       2010-01-28 6:41:06
Message-ID: 201001280643.o0S6hKav020881 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/client/encodesvc/engine/encsession
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv8675

Modified Files:
      Tag: PRODUCER_13_0_RN
	settingsadvisor.cpp 
Log Message:
 Changes to fix Bug 252793: SA715 and 716 used for audio or video only input to \
audio-video output.

Index: settingsadvisor.cpp
===================================================================
RCS file: /cvsroot/client/encodesvc/engine/encsession/settingsadvisor.cpp,v
retrieving revision 1.1.2.36
retrieving revision 1.1.2.37
diff -u -d -r1.1.2.36 -r1.1.2.37
--- settingsadvisor.cpp	27 Jan 2010 08:52:17 -0000	1.1.2.36
+++ settingsadvisor.cpp	28 Jan 2010 06:41:04 -0000	1.1.2.37
@@ -5637,8 +5637,9 @@
                         // Detrmine if we have an audio-only or video-only audience
                         HXBOOL bAudioOnlyAudience = bHasAudioStream  && \
                !bHasVideoStream;
                         HXBOOL bVideoOnlyAudience = !bHasAudioStream && \
bHasVideoStream; +                        HXBOOL bAudioVideoAudience = \
                bHasAudioStream && bHasVideoStream;
                         // Check to see if we have a mis-match in the source and \
                audience
-                        if ((bAudioOnlySource && bHasVideoStream) || \
(bVideoOnlySource && bHasAudioStream)) +                        if ((bAudioOnlySource \
&& bVideoOnlyAudience) || (bVideoOnlySource && bAudioOnlyAudience))  {
                             // Determine which message ID to throw
                             UINT32 ulMsgID = (bAudioOnlySource ? 715 : 716);
@@ -5664,6 +5665,34 @@
                             }
                             HX_RELEASE(pMsg);
                         }
+
+                        // Check to see if we have a mis-match in the source and \
audience +                        if ((bAudioOnlySource && bAudioVideoAudience) || \
(bVideoOnlySource && bAudioVideoAudience)) +                        {
+                            // Determine which message to throw
+                            UINT32 ulMsgID = (bAudioOnlySource ? 717 : 718);
+                            // Throw SA717 or SA718
+                            IHXTSettingsAdvisorMessage* pMsg = NULL;
+                            retVal = CreateSettingsAdvisorMessageFromArgs(ulMsgID,
+                                                                          \
LC_APP_ERROR, +                                                                       \
JOBFILE, +                                                                          \
pMsg, +                                                                          2,
+                                                                          \
"AudienceName", +                                                                     \
eTypeCString, +                                                                       \
pszAudienceName, +                                                                    \
"OutputName", +                                                                       \
eTypeCString, +                                                                       \
pszOutputName); +                            if (SUCCEEDED(retVal))
+                            {
+                                // Add this message to the list
+                                pList->InsertTail((IUnknown*) pMsg);
+                                // Set the out parameter
+                                rbValid = FALSE;
+                            }
+                            HX_RELEASE(pMsg);
+                        }
                     }
                 }
             }
@@ -8241,9 +8270,6 @@
 
     if (pBag && pszFileName && pList)
     {
-        // Determine if this is an audio-only or video-only source
-        HXBOOL bAudioOnlySource = bHasAudio  && !bHasVideo;
-        HXBOOL bVideoOnlySource = !bHasAudio && bHasVideo;
         // Get the "EnableTwoPass" attribute
         HXBOOL bEnableTwoPass = FALSE;
         GetBoolean(pBag, "EnableTwoPass", bEnableTwoPass);
@@ -8379,30 +8405,6 @@
                             }
                             HX_RELEASE(pMsg);
                         }
-                        // Check if we have disabled the output for the only source \
                we have
-                        if ((bAudioOnlySource && bDisableAudio) || (bVideoOnlySource \
                && bDisableVideo))
-                        {
-                            // Determine which message to throw
-                            UINT32 ulMsgID = (bAudioOnlySource ? 717 : 718);
-                            // Throw SA717 or SA718
-                            IHXTSettingsAdvisorMessage* pMsg = NULL;
-                            retVal = CreateSettingsAdvisorMessageFromArgs(ulMsgID,
-                                                                          \
                LC_APP_WARN,
-                                                                          JOBFILE,
-                                                                          pMsg,
-                                                                          1,
-                                                                          \
                "OutputName",
-                                                                          \
                eTypeCString,
-                                                                          \
                pszOutputName);
-                            if (SUCCEEDED(retVal))
-                            {
-                                // Add this message to the list
-                                pList->InsertTail((IUnknown*) pMsg);
-                                // Set the out parameter
-                                rbValid = FALSE;
-                            }
-                            HX_RELEASE(pMsg);
-                        }
                         // Init the total average bitrate across all audiences
                         UINT32 ulAvgBitRateAllAudiences = 0;
                         // Get the <Audiences> element


_______________________________________________
Client-cvs mailing list
Client-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/client-cvs


[prev in list] [next in list] [prev in thread] [next in thread]