OSDN -- Desarrollar y descargar software de código abierto
Translation Status of Español translation status for es

Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

external-opencore: Commit

external/opencore


Commit MetaInfo

Revisióncb88b4cff137df5bef1ebcb6840c4dde5b4f947d (tree)
Tiempo2010-03-31 06:58:53
AutorPacketVideo CM <engbuild@pv.c...>
CommiterPacketVideo CM

Log Message

RIO-8844: A flag needs to be initialized correctly for decoder node codec config data not to be affected by inserting a pause command

Change-Id: I782f4eca512b48c7888843990876353a54038696

Cambiar Resumen

Diferencia incremental

--- a/engines/2way/src/pv_2way_sdkinfo.h
+++ b/engines/2way/src/pv_2way_sdkinfo.h
@@ -21,7 +21,7 @@
2121 // This header file is automatically generated at build-time
2222 // *** OFFICIAL RELEASE INFO -- Will not auto update
2323
24-#define PV2WAY_ENGINE_SDKINFO_LABEL "1342390"
24+#define PV2WAY_ENGINE_SDKINFO_LABEL "1342738"
2525 #define PV2WAY_ENGINE_SDKINFO_DATE 0x20100325
2626
2727 #endif //PV_2WAY_SDKINFO_H_INCLUDED
--- a/engines/author/src/pv_author_sdkinfo.h
+++ b/engines/author/src/pv_author_sdkinfo.h
@@ -21,7 +21,7 @@
2121 // This header file is automatically generated at build-time
2222 // *** OFFICIAL RELEASE INFO -- Will not auto update
2323
24-#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1342390"
24+#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1342738"
2525 #define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100325
2626
2727 #endif //PV_AUTHOR_SDKINFO_H_INCLUDED
--- a/engines/player/src/pv_player_sdkinfo.h
+++ b/engines/player/src/pv_player_sdkinfo.h
@@ -21,7 +21,7 @@
2121 // This header file is automatically generated at build-time
2222 // *** OFFICIAL RELEASE INFO -- Will not auto update
2323
24-#define PVPLAYER_ENGINE_SDKINFO_LABEL "1342390"
24+#define PVPLAYER_ENGINE_SDKINFO_LABEL "1342738"
2525 #define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100325
2626
2727 #endif //PV_PLAYER_SDKINFO_H_INCLUDED
--- a/nodes/pvomxaudiodecnode/src/pvmf_omx_audiodec_node.cpp
+++ b/nodes/pvomxaudiodecnode/src/pvmf_omx_audiodec_node.cpp
@@ -2049,6 +2049,10 @@ PVMFStatus PVMFOMXAudioDecNode::InitDecoder(PVMFSharedMediaDataPtr& DataIn)
20492049 iConfigDataBuffersOutstanding++;
20502050 iIsThereMoreConfigDataToBeSent = false;
20512051 }
2052+ else
2053+ {
2054+ iIsThereMoreConfigDataToBeSent = false;
2055+ }
20522056
20532057 return PVMFSuccess;
20542058 }
--- a/nodes/pvomxbasedecnode/src/pvmf_omx_basedec_node.cpp
+++ b/nodes/pvomxbasedecnode/src/pvmf_omx_basedec_node.cpp
@@ -3490,12 +3490,7 @@ OSCL_EXPORT_REF void PVMFOMXBaseDecNode::HandleComponentStateChange(OMX_U32 deco
34903490 // this state can be reached either going from OMX_Loaded->OMX_Idle (preparing)
34913491 // or going from OMX_Executing->OMX_Idle (stopping)
34923492
3493- // reset the flag requiring config data processing by the component (even if it has been set previously) -
3494- // when we next send config data (if a data format requires it) - we may set this flag to true
3495- iIsConfigDataProcessingCompletionNeeded = false;
3496- iIsThereMoreConfigDataToBeSent = false;
3497- iConfigDataBuffersOutstanding = 0; // no need to keep track of this any more
3498- iConfigDataBytesProcessed = 0;
3493+
34993494
35003495 if (PVMF_GENERIC_NODE_PREPARE == iCurrentCommand.iCmd)
35013496 {
@@ -4524,7 +4519,7 @@ OSCL_EXPORT_REF PVMFStatus PVMFOMXBaseDecNode::DoPrepare()
45244519 // reset the flag requiring config data processing by the component (even if it has been set previously) -
45254520 // when we send config data (if a data format requires it) - we may set this flag to true
45264521 iIsConfigDataProcessingCompletionNeeded = false;
4527- iIsThereMoreConfigDataToBeSent = false;
4522+ iIsThereMoreConfigDataToBeSent = true;
45284523 iConfigDataBuffersOutstanding = 0;
45294524 iConfigDataBytesProcessed = 0;
45304525
--- a/nodes/pvomxvideodecnode/src/pvmf_omx_videodec_node.cpp
+++ b/nodes/pvomxvideodecnode/src/pvmf_omx_videodec_node.cpp
@@ -1295,11 +1295,11 @@ PVMFStatus PVMFOMXVideoDecNode::InitDecoder(PVMFSharedMediaDataPtr& DataIn)
12951295
12961296 }
12971297 while (iConfigDataBytesProcessed < (uint8)initbufsize);
1298+ }
1299+ // at this point, we've sent all there is to be sent
1300+ iIsThereMoreConfigDataToBeSent = false;
12981301
1299- // at this point, we've sent all there is to be sent
1300- iIsThereMoreConfigDataToBeSent = false;
13011302
1302- }
13031303 }
13041304 else if (Format == PVMF_MIME_H264_VIDEO_RAW)
13051305 {
@@ -1342,11 +1342,11 @@ PVMFStatus PVMFOMXVideoDecNode::InitDecoder(PVMFSharedMediaDataPtr& DataIn)
13421342 iConfigDataBytesProcessed += (nal_length + sc_size);
13431343 }
13441344 while (size);
1345+ }
1346+ // at this point, we've sent all there is to be sent
1347+ iIsThereMoreConfigDataToBeSent = false;
13451348
1346- // at this point, we've sent all there is to be sent
1347- iIsThereMoreConfigDataToBeSent = false;
13481349
1349- }
13501350 }
13511351 else if (Format == PVMF_MIME_M4V ||
13521352 Format == PVMF_MIME_H2631998 ||
@@ -1377,6 +1377,10 @@ PVMFStatus PVMFOMXVideoDecNode::InitDecoder(PVMFSharedMediaDataPtr& DataIn)
13771377 iIsThereMoreConfigDataToBeSent = false;
13781378
13791379 }
1380+ else
1381+ {
1382+ iIsThereMoreConfigDataToBeSent = false;
1383+ }
13801384 }
13811385 else if (Format == PVMF_MIME_WMV)
13821386 {
@@ -1412,9 +1416,11 @@ PVMFStatus PVMFOMXVideoDecNode::InitDecoder(PVMFSharedMediaDataPtr& DataIn)
14121416
14131417 // set the flag requiring config data processing by the component
14141418 iIsConfigDataProcessingCompletionNeeded = true;
1415- // at this point, we've sent all there is to be sent
1416- iIsThereMoreConfigDataToBeSent = false;
14171419 }
1420+
1421+ // at this point, we've sent all there is to be sent
1422+ iIsThereMoreConfigDataToBeSent = false;
1423+
14181424 }
14191425 else
14201426 {
Show on old repository browser