# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1263842016 -7200
# Node ID 12f9acf7a934f26d75b0c4b592076db88bd75445
# Parent  17b6bb2b14ba0c44fa67e770d7a9a4f077414dd8
Revision: 201001
Kit: 201003

diff -r 17b6bb2b14ba -r 12f9acf7a934 dvrengine/CommonRecordingEngine/src/CCRRTSPPacketSource.cpp
--- a/dvrengine/CommonRecordingEngine/src/CCRRTSPPacketSource.cpp	Thu Jan 07 13:25:49 2010 +0200
+++ b/dvrengine/CommonRecordingEngine/src/CCRRTSPPacketSource.cpp	Mon Jan 18 21:13:36 2010 +0200
@@ -838,25 +838,24 @@
                         {
                         iResponses[iStage]->SessionId( iSessionId );
                         }
-                    // If we see that we don't need to send further setups,
-                    // do send punch packets now.
-                    if ( iSdpParser &&                        // if we have sdp parser
-                       ( iSdpParser->VideoControlAddr().Length() &&  // and it shows we have video
-                         iResponses[ERTSPSetupVideoSent] &&   // and we have video se tup
-                         iSdpParser->AudioControlAddr().Length() &&  // and it shows we have audio
-                         iResponses[ERTSPSetupAudioSent] ) || // and we have audio set up
-                       ( !iSdpParser->VideoControlAddr().Length() && // or it shows we have no video
-                         !iResponses[ERTSPSetupVideoSent] && // and we've video not set up
-                         iSdpParser->AudioControlAddr().Length() &&  // and it shows we have audio
-                         iResponses[ERTSPSetupAudioSent] ) || // and we've audio set up
-                       ( iSdpParser->VideoControlAddr().Length() &&  // or it shows we've video
-                         iResponses[ERTSPSetupVideoSent] &&   // and we have video set up
-                         !iSdpParser->AudioControlAddr().Length() &&  // and we have no audio
-                         !iResponses[ERTSPSetupAudioSent] ) )// and we have no audio set up
+                    // Check for sdp parser and send punch packets for UDP transport
+                    // (TCP or multicast: session setup and PLAY in SendRTSPCommand)
+                    if ( iSdpParser && iTransport == ERTPOverUDP )
                         {
-                        // Only send punch packets for UDP transport
-                        // TCP or multicast: session setup and PLAY in SendRTSPCommand
-                        if ( iTransport == ERTPOverUDP )
+                        // If we see that we don't need to send further setups,
+                        // do send punch packets now.
+                        if ( ( iSdpParser->VideoControlAddr().Length() && // if we have video
+                             iResponses[ERTSPSetupVideoSent] &&   // and we have video se tup
+                             iSdpParser->AudioControlAddr().Length() &&   // and we have audio
+                             iResponses[ERTSPSetupAudioSent] ) || // and we have audio set up or...
+                           ( !iSdpParser->VideoControlAddr().Length() &&  // if we have no video
+                             !iResponses[ERTSPSetupVideoSent] &&  // and we've video not set up
+                             iSdpParser->AudioControlAddr().Length() &&   // and it shows we have audio
+                             iResponses[ERTSPSetupAudioSent] ) || // and we've audio set up or...
+                           ( iSdpParser->VideoControlAddr().Length() &&   // if we have video
+                             iResponses[ERTSPSetupVideoSent] &&   // and we have video set up
+                             !iSdpParser->AudioControlAddr().Length() &&  // and we have no audio
+                             !iResponses[ERTSPSetupAudioSent] ) ) // and we have no audio set up
                             {
                             SendPunchPacketsL();
                             }
diff -r 17b6bb2b14ba -r 12f9acf7a934 videoutils_plat/videoplayer_constants_api/inc/vcxmyvideosdefs.h
--- a/videoutils_plat/videoplayer_constants_api/inc/vcxmyvideosdefs.h	Thu Jan 07 13:25:49 2010 +0200
+++ b/videoutils_plat/videoplayer_constants_api/inc/vcxmyvideosdefs.h	Mon Jan 18 21:13:36 2010 +0200
@@ -248,6 +248,27 @@
 //KMPXMediaVideoBitRate
 
 /**
+ *  10.2 (FULL)
+ *  TUint16, Y-axis
+ *  Saved to MDS.
+ */
+//KMPXMediaVideoWidth
+
+/**
+ *  10.3 (FULL)
+ *  TUint16, X-axis
+ *  Saved to MDS.
+ */
+//KMPXMediaVideoHeight
+
+/**
+ *  10.4 (FULL)
+ *  Descriptor, artist name.
+ *  Saved to MDS.
+ */
+//KMPXMediaVideoArtist
+
+/**
 *  11. (BRIEF)
 *  TInt64, size in bytes. 
 *  Saved to MDS.