virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-19 09:02:26 +02:00
Code Issues Releases Activity

Change mtv_read_packet so it does not break after seeking (displaying a shifted image).

Browse Source 
Originally committed as revision 14020 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2008-06-28 09:01:16 +00:00
parent 34bfe875d5
commit ddca6ab678
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavformat/mtv.c
View File

@ -46,9 +46,7 @@ typedef struct MTVDemuxContext {
unsigned int img_height; // unsigned int img_height; //
unsigned int img_segment_size; ///< size of image segment unsigned int img_segment_size; ///< size of image segment
unsigned int video_fps; // unsigned int video_fps; //
unsigned int audio_subsegments; ///< audio subsegments on one segment unsigned int full_segment_size;
uint8_t audio_packet_count;
} MTVDemuxContext; } MTVDemuxContext;
@ -67,6 +65,7 @@ static int mtv_read_header(AVFormatContext *s, AVFormatParameters *ap)
MTVDemuxContext *mtv = s->priv_data; MTVDemuxContext *mtv = s->priv_data;
ByteIOContext *pb = s->pb; ByteIOContext *pb = s->pb;
AVStream *st; AVStream *st;
unsigned int audio_subsegments;
url_fskip(pb, 3); url_fskip(pb, 3);
@ -81,15 +80,14 @@ static int mtv_read_header(AVFormatContext *s, AVFormatParameters *ap)
mtv->img_height = get_le16(pb); mtv->img_height = get_le16(pb);
mtv->img_segment_size = get_le16(pb); mtv->img_segment_size = get_le16(pb);
url_fskip(pb, 4); url_fskip(pb, 4);
mtv->audio_subsegments = get_le16(pb); audio_subsegments = get_le16(pb);
mtv->video_fps = (mtv->audio_br / 4) / mtv->audio_subsegments; mtv->full_segment_size =
audio_subsegments * (MTV_AUDIO_PADDING_SIZE + MTV_ASUBCHUNK_DATA_SIZE) +
mtv->img_segment_size;
mtv->video_fps = (mtv->audio_br / 4) / audio_subsegments;
/* FIXME Add sanity check here */ /* FIXME Add sanity check here */
/* first packet is always audio*/
mtv->audio_packet_count = 1;
/* all systems go! init decoders */ /* all systems go! init decoders */
/* video - raw rgb565 */ /* video - raw rgb565 */
@ -139,7 +137,7 @@ static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt)
ret = 0; ret = 0;
if(mtv->audio_subsegments >= mtv->audio_packet_count) if((url_ftell(pb) - s->data_offset + mtv->img_segment_size) % mtv->full_segment_size)
{ {
url_fskip(pb, MTV_AUDIO_PADDING_SIZE); url_fskip(pb, MTV_AUDIO_PADDING_SIZE);
@ -147,7 +145,6 @@ static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt)
if(ret != MTV_ASUBCHUNK_DATA_SIZE) if(ret != MTV_ASUBCHUNK_DATA_SIZE)
return AVERROR(EIO); return AVERROR(EIO);
mtv->audio_packet_count++;
pkt->pos -= MTV_AUDIO_PADDING_SIZE; pkt->pos -= MTV_AUDIO_PADDING_SIZE;
pkt->stream_index = AUDIO_SID; pkt->stream_index = AUDIO_SID;
@ -168,7 +165,6 @@ static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt)
for(i=0;i<mtv->img_segment_size/2;i++) for(i=0;i<mtv->img_segment_size/2;i++)
*((uint16_t *)pkt->data+i) = bswap_16(*((uint16_t *)pkt->data+i)); *((uint16_t *)pkt->data+i) = bswap_16(*((uint16_t *)pkt->data+i));
#endif #endif
mtv->audio_packet_count = 1;
pkt->stream_index = VIDEO_SID; pkt->stream_index = VIDEO_SID;
} }