CR:Change smil generation mechanism for dbus-server

CR: Change smil generation mechanism for dbus-server

Synopsis:

Change smil generation mechanism

Overview: 

    Related bug 8256: can't config video size and text size in
.hxdbussvrrc file

    Currently, smil and rt file generation mechanism is that if it finds
a smil file is already exist, it will not generate new smil and rt file.
This incurs two pitfalls: 1, if preference data about smil configuration
is changed, it will not take effect unless user manually delete smil and
rt file, this is not user friendly; 2, if 1.rm and 1.avi are put
together with 1.srt, and 1.rm is played first, it would be impossible
for user to play 1.avi since smil file is not updated. So, this

    patch changes smil generation mechanism, make smil and rt files are
generated every time, since the generation of two file takes no more
than 1s on CB, user experience will not be affected.

Files Added:


    None

Files Modified:

    helix-dbus-server.cpp:
(player/kit/dbus-server/src/helix-dbus-server.cpp)

         Change smil generation mechanism

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

    little

Platforms and Profiles Affected:

    platform:   linux-2.2-libc6-gcc32-i586

    profile:    helix-client-all-defines

Distribution Libraries Affected:

    <helix-dbus-server.bin>

Distribution library impact and planned action:

    <None>

Platforms and Profiles Build Verified:

    Set BIF branch  -> hxdbus_3_1_0_atlas

    Set Target(s)   -> dbus_server_with_video

    Set Profile     -> helix-client-all-defines

    System ID       -> linux-2.2-libc6-gcc32-i586

Branch: 

    HEAD, hxclient_3_1_0_atlas

Copyright assignment: <MUST be one of the following statements >

  2.      Intel has signed and delivered a Joint Copyright Assignment

           to RealNetworks, and received acknowledgment that the 

           agreement was received. 

Files Attached:

    smil_generate.diff

 

Best Regards, Zheng, Huan(ZBT)

OTC/SSD/SSG

Intel Aisa-Pacific Research & Developement Ltd

Tel: 021-6116 6435

Inet: 8821 6435

Cub: 3W035

_______________________________________________
Helix-client-dev mailing list
[email protected]
http://lists.helixcommunity.org/mailman/listinfo/helix-client-dev

Index: dbus-server/src/helix-dbus-server.cpp
===================================================================
RCS file: /cvsroot/player/kit/dbus-server/src/helix-dbus-server.cpp,v
retrieving revision 1.2.2.28
diff -u -w -r1.2.2.28 helix-dbus-server.cpp
--- dbus-server/src/helix-dbus-server.cpp	16 May 2008 02:30:15 -0000	1.2.2.28
+++ dbus-server/src/helix-dbus-server.cpp	29 May 2008 02:04:43 -0000
@@ -540,7 +540,6 @@
                     }
                 }
 
-
                 if( NULL != pPath && ( pExt - pPath) > 0 )
                 {
                     memcpy( path_temp+7,  pPath , pExt - pPath );
@@ -549,13 +548,6 @@
                     strcpy(smil_file, path_temp);
                     strcat(smil_file, ".smil");
 
-                    if( 0 == access(smil_file+7, R_OK) ) // for access function, file:// should be skiped
-                    {
-                        //the smil file already exists
-                        actual_play_file = smil_file;
-                    }
-                    else
-                    {
                         char srt_file[MAX_PATH_LEN];
                         strcpy(srt_file, path_temp);
                         strcat(srt_file, ".srt");
@@ -601,11 +593,7 @@
                             strcpy(rt_file, path_temp);
                             strcat(rt_file, ".rt");
 
-                            if( 0 != access(rt_file+7, R_OK) )
-                            {
-                                //rt file doese not exist, convert
                                 res = convert_srt_to_rt( srt_file, rt_file, video_width, text_height );
-                            }
 
                             if( S_OK == res || S_FILE_END == res)
                             {
@@ -624,7 +612,6 @@
                     }
                 }
             }
-        }
         *return_value = (gpointer)ClientPlayerOpenURL(PLAYER_TOKEN(server->player), actual_play_file, NULL);
     }
 }