Changeset 1230

Timestamp:

12/15/09 18:15:03 (8 months ago)

Author:

astrange

Message:

Merge trunk to release branch and update ffmpeg revision.

Location:

branches/perian-1.2

Files:

• . (modified) (2 props)
• Plists/Perian-Info.plist (modified) (2 diffs)
• Plists/PerianOpener-Info.plist (modified) (1 diff)
• Plists/PerianPane-Info.plist (modified) (1 diff)
• Plists/PerianUpdateChecker-Info.plist (modified) (1 diff)
• Release/Changes.txt (modified) (1 diff)
• Release/Makefile (modified) (1 diff)
• codecList.m4 (modified) (1 diff)
• ff_dataref.c (modified) (4 diffs)

branches/perian-1.2

@@ -1 @@
-ffmpeg -r 20679 svn://svn.mplayerhq.hu/ffmpeg/trunk
+ffmpeg -r 20878 svn://svn.mplayerhq.hu/ffmpeg/trunk
 libebml -r 1221 http://svn.perian.org/libebml
 libmatroska -r 1221 http://svn.perian.org/libmatroska
 a52codec -r 77 http://svn.cod3r.com/a52codec/trunk
 
+

@@ -1 @@
-ffmpeg -r 20679 svn://svn.mplayerhq.hu/ffmpeg/trunk
+ffmpeg -r 20878 svn://svn.mplayerhq.hu/ffmpeg/trunk
 libebml -r 1221 http://svn.perian.org/libebml
 libmatroska -r 1221 http://svn.perian.org/libmatroska
 a52codec -r 77 http://svn.cod3r.com/a52codec/trunk
 
+

branches/perian-1.2/Plists/Perian-Info.plist

@@ -8 +8 @@
         <string>Perian</string>
         <key>CFBundleGetInfoString</key>
-        <string>1.2b1 (SVNREVISION ffmpeg: FFMPEGREVISION), Copyright 2009 The Perian Team</string>
+        <string>1.2 (SVNREVISION ffmpeg: FFMPEGREVISION), Copyright 2009 The Perian Team</string>
         <key>CFBundleIconFile</key>
         <string>Perian_icon</string>
@@ -18 +18 @@
         <string>thng</string>
         <key>CFBundleShortVersionString</key>
-        <string>1.2b1</string>
+        <string>1.2</string>
         <key>CFBundleSignature</key>
         <string>Peri</string>
         <key>CFBundleVersion</key>
-        <string>1.2b1</string>
+        <string>1.2</string>
         <key>CSResourcesFileMapped</key>
         <string>yes</string>

branches/perian-1.2/Plists/PerianOpener-Info.plist

@@ -203 +203 @@
         <string>PerO</string>
         <key>CFBundleVersion</key>
-        <string>1.2b1</string>
+        <string>1.2</string>
         <key>NSAppleScriptEnabled</key>
         <string>YES</string>

branches/perian-1.2/Plists/PerianPane-Info.plist

@@ -20 +20 @@
         <string>????</string>
         <key>CFBundleVersion</key>
-        <string>1.2b1</string>
+        <string>1.2</string>
         <key>CFBundleGetInfoString</key>
-        <string>1.2b1 (SVNREVISION ffmpeg: FFMPEGREVISION), Copyright 2009 The Perian Team</string>
+        <string>1.2 (SVNREVISION ffmpeg: FFMPEGREVISION), Copyright 2009 The Perian Team</string>
         <key>CFBundleName</key>
         <string>Perian</string>

branches/perian-1.2/Plists/PerianUpdateChecker-Info.plist

@@ -18 +18 @@
         <string>????</string>
         <key>CFBundleVersion</key>
-        <string>1.2b1</string>
+        <string>1.2</string>
         <key>NSMainNibFile</key>
         <string>UpdateCheckerMainMenu</string>

branches/perian-1.2/Release/Changes.txt

@@ -17 +17 @@
 - Better support for tracks with delayed start times [r1181]
 - Fixed MPEG1/2 in Matroska playing out of order [r1188]
+- Fixed a crash opening files while they were being downloaded [r1227]
 SSA:
 - Fixed some top-aligned subtitles being too low [r1163]

branches/perian-1.2/Release/Makefile

@@ -4 +4 @@
 # Check the Perian.component target and PerianPane target.
 
-VERSION=1.2b1
+VERSION=1.2
 BETA=TRUE
 SRC_DIR=..

branches/perian-1.2/codecList.m4

@@ -7 +7 @@
 Codec(k3ivxCodecInfoResID, CODEC_ID_MPEG4, "3ivx", "Decompresses video stored in 3ivx format.", '3IVD', '3ivd', '3IV2', '3iv2')
 Codec(kXVIDCodecInfoResID, CODEC_ID_MPEG4, "Xvid", "Decompresses video stored in Xvid format.", 'XVID', 'xvid', 'XviD', 'XVIX', 'BLZ0')
-Codec(kMPEG4CodecInfoResID, CODEC_ID_MPEG4, "MPEG-4", "Decompresses video stored in MPEG-4 format.", 'RMP4', 'SEDG', 'WV1F', 'FMP4', 'SMP4', 'mp4v')
+Codec(kMPEG4CodecInfoResID, CODEC_ID_MPEG4, "MPEG-4", "Decompresses video stored in MPEG-4 format.", 'RMP4', 'SEDG', 'WV1F', 'FMP4', 'SMP4')
+ResourceOnly(<!// XXX: can we do this without claiming Apple's manufacturer (and thus unregistering their decoder)?!>)
+ResourceOnly(<!#define kCodecManufacturer 'appl'!>)
+ResourceOnly(<!#define kCodecVersion kFFusionCodecVersion + 0x10!>)
+Codec(kMPEG4CodecInfoResID, CODEC_ID_MPEG4, "MPEG-4", "Decompresses video stored in MPEG-4 format.", 'mp4v')
+ResourceOnly(<!#define kCodecVersion kFFusionCodecVersion!>)
+ResourceOnly(<!#define kCodecManufacturer kFFusionCodecManufacturer!>)
 Codec(kH264CodecInfoResID, CODEC_ID_H264, "H.264", "Decompresses video stored in H.264 format.", 'H264', 'h264', 'X264', 'x264', 'DAVC', 'VSSH', 'AVC1', 'avc1')
 Codec(kFLV1CodecInfoResID, CODEC_ID_FLV1, "Sorenson H.263", "Decompresses video stored in Sorenson H.263 format.", 'FLV1')

branches/perian-1.2/ff_dataref.c

@@ -37 +37 @@
 /* DataRef Wrapper for QuickTime */
 
-/* !!! THIS FUNCTION ASSUMES h->priv_data IS VALID in contrary to the other open functions
-* found in ffmpeg */
-static int dataref_open(URLContext *h, const char *filename, int flags)
-{
-        ComponentResult result;
-        dataref_private *private;
+static int dataref_update_filesize(dataref_private *private)
+{
         wide fsize;
-        long access = 0;
-        
-        if(flags & URL_RDWR) {
-                access = kDataHCanRead | kDataHCanWrite;
-        } else if(flags & URL_WRONLY) {
-                access = kDataHCanWrite;
-        } else {
-                access = kDataHCanRead;
-        }
-        
-        private = h->priv_data;
-        result = OpenAComponent(GetDataHandler(private->dataRef, private->dataRefType, access), &private->dh);
-        require_noerr(result,bail);
-        
-        result = DataHSetDataRef(private->dh, private->dataRef);
-        require_noerr(result,bail);
-        
-        if(access & kDataHCanRead) {
-                result = DataHOpenForRead(private->dh);
-                require_noerr(result,bail);
-        }
-        if(access & kDataHCanWrite) {
-                result = DataHOpenForWrite(private->dh);
-                require_noerr(result,bail);
-        }
-        
-        private->pos = 0ll;
-        private->size = 0ll;
-        
-        result = DataHGetFileSize64(private->dh, &fsize);
+        ComponentResult result = DataHGetFileSize64(private->dh, &fsize);
         if(result == noErr) {
                 private->size = (int64_t)fsize.lo;
@@ -85 +52 @@
                 private->size = size32;
         }
-        
-bail:
-                return result;
+bail:
+        return result;
+}
+
+/* !!! THIS FUNCTION ASSUMES h->priv_data IS VALID in contrary to the other open functions
+* found in ffmpeg */
+static int dataref_open(URLContext *h, const char *filename, int flags)
+{
+        ComponentResult result;
+        dataref_private *private;
+        long access = 0;
+        
+        if(flags & URL_RDWR) {
+                access = kDataHCanRead | kDataHCanWrite;
+        } else if(flags & URL_WRONLY) {
+                access = kDataHCanWrite;
+        } else {
+                access = kDataHCanRead;
+        }
+        
+        private = h->priv_data;
+        result = OpenAComponent(GetDataHandler(private->dataRef, private->dataRefType, access), &private->dh);
+        require_noerr(result,bail);
+        
+        result = DataHSetDataRef(private->dh, private->dataRef);
+        require_noerr(result,bail);
+        
+        if(access & kDataHCanRead) {
+                result = DataHOpenForRead(private->dh);
+                require_noerr(result,bail);
+        }
+        if(access & kDataHCanWrite) {
+                result = DataHOpenForWrite(private->dh);
+                require_noerr(result,bail);
+        }
+        
+        private->pos = 0ll;
+        private->size = 0ll;
+        
+        result = dataref_update_filesize(private);
+        require_noerr(result,bail);
+bail:
+        return result;
 } /* dataref_open() */
 
@@ -93 +100 @@
 {
         int result;
-        int64_t read;
-
-        dataref_private *p = (dataref_private*)h->priv_data;
-        
-        read = p->size - p->pos;
-        read = (read < size) ? read : size;
+        dataref_private *p = (dataref_private*)h->priv_data;
+        int read;
+
+        if (p->pos + size > p->size) {
+                // it tried to read past the end
+                // but since we cache the size, it might be wrong
+                // try to update the size before clipping the request
+                dataref_update_filesize(p);
+        }
+        
+        if (p->pos >= p->size)
+                return 0; // can't read past the end
+        else
+                read = FFMIN(size, p->size - p->pos);
         
         if(p->supportsWideOffsets) {
@@ -163 +178 @@
                         break;
                 case SEEK_END:
+                        dataref_update_filesize(p);
                         p->pos = p->size + pos;
                         break;
                 case AVSEEK_SIZE:
+                        dataref_update_filesize(p);
                         return p->size;
                 default:

@@ -1 @@
-ffmpeg -r 20679 svn://svn.mplayerhq.hu/ffmpeg/trunk
+ffmpeg -r 20878 svn://svn.mplayerhq.hu/ffmpeg/trunk
 libebml -r 1221 http://svn.perian.org/libebml
 libmatroska -r 1221 http://svn.perian.org/libmatroska
 a52codec -r 77 http://svn.cod3r.com/a52codec/trunk
 
+