102 lines
4.7 KiB
Diff
102 lines
4.7 KiB
Diff
|
--- xine-lib-1.1.19/src/combined/ffmpeg/ff_video_decoder.c.orig 2010-03-10 20:07:15.000000000 +0100
|
||
|
|
+++ xine-lib-1.1.19/src/combined/ffmpeg/ff_video_decoder.c 2011-06-27 21:46:28.835606968 +0200
|
||
|
|
@@ -1055,12 +1055,16 @@ static void ff_handle_mpeg12_buffer (ff_
|
||
|
|
}
|
||
|
|
|
||
|
|
/* skip decoding b frames if too late */
|
||
|
|
- this->context->hurry_up = (this->skipframes > 0);
|
||
|
|
+ this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT;
|
||
|
|
|
||
|
|
lprintf("avcodec_decode_video: size=%d\n", this->mpeg_parser->buffer_size);
|
||
|
|
- len = avcodec_decode_video (this->context, this->av_frame,
|
||
|
|
- &got_picture, this->mpeg_parser->chunk_buffer,
|
||
|
|
- this->mpeg_parser->buffer_size);
|
||
|
|
+ AVPacket avpkt;
|
||
|
|
+ av_init_packet(&avpkt);
|
||
|
|
+ avpkt.data = (uint8_t *)this->mpeg_parser->chunk_buffer;
|
||
|
|
+ avpkt.size = this->mpeg_parser->buffer_size;
|
||
|
|
+ avpkt.flags = AV_PKT_FLAG_KEY;
|
||
|
|
+ len = avcodec_decode_video2 (this->context, this->av_frame,
|
||
|
|
+ &got_picture, &avpkt);
|
||
|
|
lprintf("avcodec_decode_video: decoded_size=%d, got_picture=%d\n",
|
||
|
|
len, got_picture);
|
||
|
|
len = current - buf->content - offset;
|
||
|
|
@@ -1112,7 +1116,7 @@ static void ff_handle_mpeg12_buffer (ff_
|
||
|
|
|
||
|
|
} else {
|
||
|
|
|
||
|
|
- if (this->context->hurry_up) {
|
||
|
|
+ if (this->context->skip_frame != AVDISCARD_DEFAULT) {
|
||
|
|
/* skipped frame, output a bad frame */
|
||
|
|
img = this->stream->video_out->get_frame (this->stream->video_out,
|
||
|
|
this->bih.biWidth,
|
||
|
|
@@ -1304,12 +1308,16 @@ static void ff_handle_buffer (ff_video_d
|
||
|
|
got_picture = 0;
|
||
|
|
} else {
|
||
|
|
/* skip decoding b frames if too late */
|
||
|
|
- this->context->hurry_up = (this->skipframes > 0);
|
||
|
|
+ this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT;
|
||
|
|
|
||
|
|
lprintf("buffer size: %d\n", this->size);
|
||
|
|
- len = avcodec_decode_video (this->context, this->av_frame,
|
||
|
|
- &got_picture, &chunk_buf[offset],
|
||
|
|
- this->size);
|
||
|
|
+ AVPacket avpkt;
|
||
|
|
+ av_init_packet(&avpkt);
|
||
|
|
+ avpkt.data = (uint8_t *)&chunk_buf[offset];
|
||
|
|
+ avpkt.size = this->size;
|
||
|
|
+ avpkt.flags = AV_PKT_FLAG_KEY;
|
||
|
|
+ len = avcodec_decode_video2 (this->context, this->av_frame,
|
||
|
|
+ &got_picture, &avpkt);
|
||
|
|
|
||
|
|
#ifdef AVCODEC_HAS_REORDERED_OPAQUE
|
||
|
|
/* reset consumed pts value */
|
||
|
|
--- xine-lib-1.1.19/src/combined/ffmpeg/ff_audio_decoder.c.orig 2010-03-23 16:41:49.000000000 +0100
|
||
|
|
+++ xine-lib-1.1.19/src/combined/ffmpeg/ff_audio_decoder.c 2011-06-27 21:29:30.168906191 +0200
|
||
|
|
@@ -255,6 +255,7 @@ static void ff_audio_decode_data (audio_
|
||
|
|
buf->decoder_info[2]);
|
||
|
|
|
||
|
|
} else if (!(buf->decoder_flags & BUF_FLAG_SPECIAL)) {
|
||
|
|
+ AVPacket avpkt;
|
||
|
|
|
||
|
|
if( !this->decoder_ok ) {
|
||
|
|
if ( ! this->context || ! this->codec ) {
|
||
|
|
@@ -286,11 +287,13 @@ static void ff_audio_decode_data (audio_
|
||
|
|
if (!this->output_open) {
|
||
|
|
if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) {
|
||
|
|
decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
|
||
|
|
- avcodec_decode_audio2 (this->context,
|
||
|
|
- (int16_t *)this->decode_buffer,
|
||
|
|
- &decode_buffer_size,
|
||
|
|
- &this->buf[0],
|
||
|
|
- this->size);
|
||
|
|
+ av_init_packet(&avpkt);
|
||
|
|
+ avpkt.data = (uint8_t *)&this->buf[0];
|
||
|
|
+ avpkt.size = this->size;
|
||
|
|
+ avpkt.flags = AV_PKT_FLAG_KEY;
|
||
|
|
+ avcodec_decode_audio3 (this->context,
|
||
|
|
+ (int16_t *)this->decode_buffer,
|
||
|
|
+ &decode_buffer_size, &avpkt);
|
||
|
|
this->audio_bits = this->context->bits_per_sample;
|
||
|
|
this->audio_sample_rate = this->context->sample_rate;
|
||
|
|
this->audio_channels = this->context->channels;
|
||
|
|
@@ -311,11 +314,13 @@ static void ff_audio_decode_data (audio_
|
||
|
|
offset = 0;
|
||
|
|
while (this->size>0) {
|
||
|
|
decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
|
||
|
|
- bytes_consumed = avcodec_decode_audio2 (this->context,
|
||
|
|
- (int16_t *)this->decode_buffer,
|
||
|
|
- &decode_buffer_size,
|
||
|
|
- &this->buf[offset],
|
||
|
|
- this->size);
|
||
|
|
+ av_init_packet(&avpkt);
|
||
|
|
+ avpkt.data = (uint8_t *)&this->buf[offset];
|
||
|
|
+ avpkt.size = this->size;
|
||
|
|
+ avpkt.flags = AV_PKT_FLAG_KEY;
|
||
|
|
+ bytes_consumed = avcodec_decode_audio3 (this->context,
|
||
|
|
+ (int16_t *)this->decode_buffer,
|
||
|
|
+ &decode_buffer_size, &avpkt);
|
||
|
|
|
||
|
|
if (bytes_consumed<0) {
|
||
|
|
xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
|