generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge palette-only header with actual video frame.

Browse Source 
This fixes the video frame pts (off by one for each MVIh)
and makes the "key frames" decode stand-alone (MVIh
contains only palette, such a palette-only frame being
marked as key frame is not really correct).

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
Reimar Döffinger 2012-01-22 13:17:53 +01:00
parent 0b378e8aa9
commit a0eb8de5e0
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/eacmv.c
View File

@ -162,8 +162,11 @@ static int cmv_decode_frame(AVCodecContext *avctx,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if (AV_RL32(buf)==MVIh_TAG||AV_RB32(buf)==MVIh_TAG) { if (AV_RL32(buf)==MVIh_TAG||AV_RB32(buf)==MVIh_TAG) {
unsigned size = AV_RL32(buf + 4);
cmv_process_header(s, buf+EA_PREAMBLE_SIZE, buf_end); cmv_process_header(s, buf+EA_PREAMBLE_SIZE, buf_end);
return buf_size; if (size > buf_end - buf - EA_PREAMBLE_SIZE)
return -1;
buf += size;
} }
if (av_image_check_size(s->width, s->height, 0, s->avctx)) if (av_image_check_size(s->width, s->height, 0, s->avctx))

22
libavformat/electronicarts.c
View File

@ -469,11 +469,12 @@ static int ea_read_packet(AVFormatContext *s,
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
int ret = 0; int ret = 0;
int packet_read = 0; int packet_read = 0;
int partial_packet = 0;
unsigned int chunk_type, chunk_size; unsigned int chunk_type, chunk_size;
int key = 0; int key = 0;
int av_uninit(num_samples); int av_uninit(num_samples);
while (!packet_read) { while (!packet_read || partial_packet) {
chunk_type = avio_rl32(pb); chunk_type = avio_rl32(pb);
chunk_size = (ea->big_endian ? avio_rb32(pb) : avio_rl32(pb)) - 8; chunk_size = (ea->big_endian ? avio_rb32(pb) : avio_rl32(pb)) - 8;
@ -496,6 +497,11 @@ static int ea_read_packet(AVFormatContext *s,
avio_skip(pb, 8); avio_skip(pb, 8);
chunk_size -= 12; chunk_size -= 12;
} }
if (partial_packet) {
av_log_ask_for_sample(s, "video header followed by audio packet not supported.\n");
av_free_packet(pkt);
partial_packet = 0;
}
ret = av_get_packet(pb, pkt, chunk_size); ret = av_get_packet(pb, pkt, chunk_size);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -558,9 +564,15 @@ static int ea_read_packet(AVFormatContext *s,
key = AV_PKT_FLAG_KEY; key = AV_PKT_FLAG_KEY;
case MV0F_TAG: case MV0F_TAG:
get_video_packet: get_video_packet:
ret = av_get_packet(pb, pkt, chunk_size); if (partial_packet) {
if (ret < 0) ret = av_append_packet(pb, pkt, chunk_size);
return ret; } else
ret = av_get_packet(pb, pkt, chunk_size);
if (ret < 0) {
packet_read = 1;
break;
}
partial_packet = chunk_type == MVIh_TAG;
pkt->stream_index = ea->video_stream_index; pkt->stream_index = ea->video_stream_index;
pkt->flags |= key; pkt->flags |= key;
packet_read = 1; packet_read = 1;
@ -572,6 +584,8 @@ get_video_packet:
} }
} }
if (ret < 0 && partial_packet)
av_free_packet(pkt);
return ret; return ret;
} }