diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-23 02:12:15 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-23 02:12:15 +0000 |
commit | da08b8a0768abaf17b89006b18b19aa5c8b7a3a8 (patch) | |
tree | d3322715c39d5f628c11884ae810ea0d33984a63 /libmpdemux/video.c | |
parent | 1c07dc9f3f26b8eb28c284fc4e8418c962c58963 (diff) | |
download | mpv-da08b8a0768abaf17b89006b18b19aa5c8b7a3a8.tar.bz2 mpv-da08b8a0768abaf17b89006b18b19aa5c8b7a3a8.tar.xz |
raw mpeg4-es support (you need to set -fps manually!)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9070 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/video.c')
-rw-r--r-- | libmpdemux/video.c | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 4df35b37ee..9888509669 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -89,6 +89,46 @@ switch(d_video->demuxer->file_format){ if (!demux_is_mpeg_rtp_stream(d_video->demuxer)) break; // otherwise fall through to... #endif + case DEMUXER_TYPE_MPEG4_ES: { + videobuf_len=0; videobuf_code_len=0; + mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for Video Object Start code... ");fflush(stdout); + while(1){ + int i=sync_video_packet(d_video); + if(i<=0x11F) break; // found it! + if(!i || !skip_video_packet(d_video)){ + mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); + return 0; + } + } + mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n"); + if(!videobuffer) videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE); + if(!videobuffer){ + mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail); + return 0; + } + mp_msg(MSGT_DECVIDEO,MSGL_V,"Searching for Video Object Layer Start code... ");fflush(stdout); + while(1){ + int i=sync_video_packet(d_video); + printf("0x%X\n",i); + if(i>=0x120 && i<=0x12F) break; // found it! + if(!i || !read_video_packet(d_video)){ + mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); + return 0; + } + } + mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\nSearching for Video Object Plane Start code... ");fflush(stdout); + while(1){ + int i=sync_video_packet(d_video); + if(i==0x1B6) break; // found it! + if(!i || !read_video_packet(d_video)){ + mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); + return 0; + } + } + mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n"); + sh_video->format=0x10000004; + break; + } case DEMUXER_TYPE_PVA: case DEMUXER_TYPE_MPEG_ES: case DEMUXER_TYPE_MPEG_PS: { @@ -316,6 +356,16 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** telecine=1; } + } else if(demuxer->file_format==DEMUXER_TYPE_MPEG4_ES){ + // + while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE){ + int i=sync_video_packet(d_video); + if(!read_video_packet(d_video)) return -1; // EOF + if(i==0x1B6) break; + } + *start=videobuffer; in_size=videobuf_len; + videobuf_len=0; + } else { // frame-based file formats: (AVI,ASF,MOV) in_size=ds_get_packet(d_video,start); |