dbp/linamh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add/delete

Browse Source
This commit is contained in:
Mario Fetka
2011-11-19 16:55:48 +01:00
parent dec0c98298
commit e191b1ef58
55 changed files with 5731 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media-libs/xine-lib/Manifest
View File

@@ -1,4 +1,5 @@
AUX xine-lib-1.1.19-xvmc.patch 485 RMD160 781a7fbc5dcc9f3c25de83625509fcce3950cca8 SHA1 f78834833e3aeb05f555688ab657ae05cd0691c7 SHA256 6be3ceb8edd7626e93c617de3068374dd638e1445c7308d88b24614e9bbceaf0
AUX xine-lib-ffmpeg-0.8.patch 4768 RMD160 fb71fda4ebdf3801ea5e480a570fb949596f4a6b SHA1 6a01a90da0079465d3f39b8c48cc875ef32184df SHA256 4d4da84a644dbdc22de2c778edddf19ad56d5c2647f3dbc6a4fc1fbdb6774da1
DIST xine-lib-1.1.15-textrel-fix.patch 29373 RMD160 4702a26f42251614f5f6c99b4770f82da36577ae SHA1 e04d04dbd736fd17be8cf0583d47630850a89bf9 SHA256 1d6aa047cb0a13f248aea2e06e16b9758b9c39d8b7e42b32d0b52b424d26b33e
DIST xine-lib-1.1.19.tar.xz 5782580 RMD160 7b8c2a4e5bcd0984414360d8d589aa533a9040f3 SHA1 f65f762d2e16adf04b9d715c91ee0bc02c322a7d SHA256 f834f646880bb44186018d12280ac27c8314447de9335b6fe390157b26df9cd9
EBUILD xine-lib-1.1.19-r1.ebuild 5656 RMD160 fc1de0bf387608f050ec2acc5c6a6a183ec3708f SHA1 d1ed0c60de50207147e97ff7a4920a1d652bb720 SHA256 7892e8fe1aca02f0edd4025df21464f4cf100f386c33ce453cee643aa1c8ab13

101
media-libs/xine-lib/files/xine-lib-ffmpeg-0.8.patch Normal file
View File

@@ -0,0 +1,101 @@
--- 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,