Commit bbf020e9 authored by Peter Ross's avatar Peter Ross

Add Electronic Arts TGV chunk tags to EA demuxer.

Originally committed as revision 14643 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent cfc78718
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#define SCDl_TAG MKTAG('S', 'C', 'D', 'l') #define SCDl_TAG MKTAG('S', 'C', 'D', 'l')
#define SCEl_TAG MKTAG('S', 'C', 'E', 'l') #define SCEl_TAG MKTAG('S', 'C', 'E', 'l')
#define kVGT_TAG MKTAG('k', 'V', 'G', 'T') /* TGV i-frame */ #define kVGT_TAG MKTAG('k', 'V', 'G', 'T') /* TGV i-frame */
#define fVGT_TAG MKTAG('f', 'V', 'G', 'T') /* TGV p-frame */
#define MADk_TAG MKTAG('M', 'A', 'D', 'k') /* MAD i-frame */ #define MADk_TAG MKTAG('M', 'A', 'D', 'k') /* MAD i-frame */
#define MPCh_TAG MKTAG('M', 'P', 'C', 'h') /* MPEG2 */ #define MPCh_TAG MKTAG('M', 'P', 'C', 'h') /* MPEG2 */
#define MVhd_TAG MKTAG('M', 'V', 'h', 'd') #define MVhd_TAG MKTAG('M', 'V', 'h', 'd')
...@@ -307,6 +308,11 @@ static int process_ea_header(AVFormatContext *s) { ...@@ -307,6 +308,11 @@ static int process_ea_header(AVFormatContext *s) {
ea->time_base = (AVRational){0,0}; ea->time_base = (AVRational){0,0};
break; break;
case kVGT_TAG:
ea->video_codec = CODEC_ID_TGV;
ea->time_base = (AVRational){0,0};
break;
case MVhd_TAG : case MVhd_TAG :
err = process_video_header_vp6(s); err = process_video_header_vp6(s);
break; break;
...@@ -450,8 +456,10 @@ static int ea_read_packet(AVFormatContext *s, ...@@ -450,8 +456,10 @@ static int ea_read_packet(AVFormatContext *s,
break; break;
case MVIh_TAG: case MVIh_TAG:
case kVGT_TAG:
key = PKT_FLAG_KEY; key = PKT_FLAG_KEY;
case MVIf_TAG: case MVIf_TAG:
case fVGT_TAG:
url_fseek(pb, -8, SEEK_CUR); // include chunk preamble url_fseek(pb, -8, SEEK_CUR); // include chunk preamble
chunk_size += 8; chunk_size += 8;
goto get_video_packet; goto get_video_packet;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment