CR-Client: Fixing flvdump and flashhost build break.

Modified by: dyekreal.com
Date: 4/20/2007
Project: RealPlayer

Synopsis: Fixing flvdump and flashhost build break.

Overview:
   flvdump and flashhost changes caused
realplay_gtk_current.bif builds
   to break:

      UNIXCompile(datatype/flash/flv/flvdump): making copy
      make copy

      flvdump.cpp: In function 'int main(int, char**)':
      flvdump.cpp:189: error: 'memset' was not declared in
this scope
      ...
      flvdump.cpp:616: warning: jump to label 'cleanup'
      flvdump.cpp:201: warning:   from here
      flvdump.cpp:205: error:   crosses initialization of
'FILE* fp'

      --- Build System Error
------------------------------------
      Make failed.

-----------------------------------------------------------

      entering directory datatype/flash/flashhost
      UNIXCompile(datatype/flash/flashhost): making copy

      flash_guest_player.cpp: In static member function
        `static HX_RESULT
CFlashGuestPlayer::CreateGuestPlayer(
          IUnknown*, IHXGuestPlayer*&)':
      flash_guest_player.cpp:495: error: `pObj' undeclared
(first use this
        function)

      --- Build System Error
------------------------------------
      Make failed.

-----------------------------------------------------------

   This change fixes the syntactic errors and remove
compiler warnings.

Files Modified:
   datatype/flash/flashhost/flash_guest_player.cpp
   datatype/flash/flv/flvdump/flvdump.cpp

Image Size and Heap Use impact (Client -Only):
None.

Platforms and Profiles Affected:
Linux

Distribution Libraries Affected:
None.

Distribution library impact and planned action:
None.

Platforms and Profiles Build Verified:
Profile: helix_client_all_define
Platform: Fedora Core 5

Platforms and Profiles Functionality verified:
Profile: helix_client_all_define
Platform: Fedora Core 5

Branch: 150Cay

Copyright assignment: I am a RealNetworks employee.

Index: flash_guest_player.cpp
============================================================
=======
RCS file:
/cvsroot/datatype/flash/flashhost/flash_guest_player.cpp,v
retrieving revision 1.23
diff -u -w -r1.23 flash_guest_player.cpp
--- flash_guest_player.cpp      12 Apr 2007 16:22:53 -0000  
   1.23
+++ flash_guest_player.cpp      20 Apr 2007 21:55:50 -0000
 -85,20
+85,20 
      : m_lRefCount(0)
      , m_pContext(NULL)
      , m_pRequest(NULL)
-    , m_bWindowless(FALSE)
-    , m_bTransparent(FALSE)
-    , m_bLoop(TRUE)
-    , m_bShowMenuPref(TRUE)
+    , m_ulGuestPlayerState(HXGUEST_STATE_PLAYER_CREATED)
      , m_pResponseList(NULL)
      , m_ulFileOffset(0)
      , m_ulFileSize(0)
      , m_pNetworkConfig(NULL)
-    , m_ulGuestPlayerState(HXGUEST_STATE_PLAYER_CREATED)
      , m_ulDuration(0)
-    , m_bHostManagesFileIO(FALSE)
-    , m_bUseOffscreenBuffer(TRUE)
+    , m_bWindowless(FALSE)
+    , m_bTransparent(FALSE)
+    , m_bLoop(TRUE)
      , m_pExternalInterfaceResponse(NULL)
      , m_bWindowlessPref(TRUE)
+    , m_bHostManagesFileIO(FALSE)
+    , m_bUseOffscreenBuffer(TRUE)
+    , m_bShowMenuPref(TRUE)
  {
      HXLOGL4(HXLOG_FPHR, "CON CFlashGuestPlayer
this=%p", this);
      m_MediaSize.cx = dDefaultWindowWidth;
 -454,6
+454,7 

      if (pContext)
      {
+        IHXGuestPlayer *pObj = NULL;
  #if defined(_WIN32)
          // See if the Netscape-plugin-based Flash player
is available
          HXBOOL bNSPluginPlayerExists = 
CFlashGuestPlayerNS::IsFlashPlayerPluginAvailable();
 -475,7
+476,6 
              }
          }
          // Create the object
-        IHXGuestPlayer *pObj = NULL;
          if (bUseActiveX)
          {
             // Use the ActiveX-based guest player

Index: flvdump.cpp
============================================================
=======
RCS file: /cvsroot/datatype/flash/flv/flvdump/flvdump.cpp,v
retrieving revision 1.5
diff -u -w -r1.5 flvdump.cpp
--- flvdump.cpp 28 Feb 2007 19:15:17 -0000      1.5
+++ flvdump.cpp 20 Apr 2007 21:57:01 -0000
 -59,6
+59,7 
  #include "hxresult.h"
  #include "hlxclib/stdio.h"
  #include "hlxclib/stdlib.h"
+#include "hxstring.h"
  #include "mhead.h"
  #include "flvparse.h"

 -165,8
+166,6 
      const char* pszVideoCodec = NULL;
      const char* pszFrameType  = NULL;

-    double      dSimple       = 320.05;
-
      BYTE                 ucBuf[HX_FLV_TMPBUF_LEN];
      CHXFLVHeader         cHdr;
      CHXFLVTagHeader      cTagHdr;
 -184,6
+183,7 
      UINT32 ulMaxAudioBitrate = 0;
      UINT32 ulMinVideoBitrate = 0xFFFFFFFF;
      UINT32 ulMaxVideoBitrate = 0;
+    FILE *fp = NULL;

      // Zero out the pair arrays
      memset(&audioPair[0], 0, HX_FLV_TIMEPAIR_SIZE *
sizeof(HXTimeSizePair));
 -196,13
+196,13 
          fprintf(stderr, "tflv_filename: name of flv
filen");
          fprintf(stderr, "tbr_window:    sliding
window time (in ms) over 
whichn");
          fprintf(stderr, "t              to calculate
average bitraten");
-        fprintf(stderr, "t             
(min=%lu,max=%lu,default=%lu)n",
+        fprintf(stderr, "t             
(min=%d,max=%d,default=%d)n",
                  HX_FLV_MIN_WINDOW, HX_FLV_MAX_WINDOW,
HX_FLV_DEFAULT_WINDOW);
          goto cleanup;
      }

      // Open the input filename
-    FILE* fp = fopen(argv[1], "rb");
+    fp = fopen(argv[1], "rb");
      if (!fp)
      {
          fprintf(stderr, "Could not open %s for
reading.n", argv[1]);
 -214,13
+214,13 
          ulBitrateWindow = (UINT32) atoi(argv[2]);
          if (ulBitrateWindow > HX_FLV_MAX_WINDOW)
          {
-            fprintf(stderr, "Bitrate window of %lu is
greater than max of 
%lu. Using maximum value.n",
+            fprintf(stderr, "Bitrate window of %ld is
greater than max of 
%d. Using maximum value.n",
                      ulBitrateWindow, HX_FLV_MAX_WINDOW);
              ulBitrateWindow = HX_FLV_MAX_WINDOW;
          }
          if (ulBitrateWindow < HX_FLV_MIN_WINDOW)
          {
-            fprintf(stderr, "Bitrate window of %lu is
less than min of 
%lu. Using minimum value.n",
+            fprintf(stderr, "Bitrate window of %ld is
less than min of %d. 
Using minimum value.n",
                      ulBitrateWindow, HX_FLV_MIN_WINDOW);
              ulBitrateWindow = HX_FLV_MIN_WINDOW;
          }
 -230,7
+230,7 
      lRead = (INT32) fread(&ucBuf[0], 1,
HX_FLV_HEADER_SIZE, fp);
      if (lRead != HX_FLV_HEADER_SIZE)
      {
-        fprintf(stderr, "Could not read %lu bytes for
FLV header.n", 
HX_FLV_HEADER_SIZE);
+        fprintf(stderr, "Could not read %d bytes for
FLV header.n", 
HX_FLV_HEADER_SIZE);
          goto cleanup;
      }

 -307,7
+307,7 
          }
          // Print out the general tag message
          fprintf(stdout, "File Offset %8lu (0x%08x):
%s Tag 
(PrevTagSize=%7lu,DataSize=%7lu,TimeStamp=%7lu) ",
-                ulFileOffset, ulFileOffset, pszTagType, 
cTagHdr.GetPreviousTagSize(),
+                ulFileOffset, (unsigned int)ulFileOffset,
pszTagType, 
cTagHdr.GetPreviousTagSize(),
                  cTagHdr.GetDataSize(),
cTagHdr.GetTimeStamp());
          // Switch on tag type
          lBytesToSkip = (INT32) cTagHdr.GetDataSize();
 -546,7
+546,7 
                      }
                      // Read in the data
                      lRead = fread(pMetaBuf, 1,
cTagHdr.GetDataSize(), fp);
-                    if (lRead != cTagHdr.GetDataSize())
+                    if ((unsigned)lRead !=
cTagHdr.GetDataSize())
                      {
                          fprintf(stderr, "Error
reading meta tag.n");
                          lRet = -1;

-- 
Daniel Yek

_______________________________________________
Datatype-dev mailing list
Datatype-devhelixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/da
tatype-dev

CR-Client: Fixing flvdump and flashhost build break.

Thread: CR-Client: Fixing flvdump and flashhost build break.