From 031746fe5d061e3425386f6b577612d7f09b0fd7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 8 Sep 2014 13:24:40 +0200 Subject: make kodi usable --- package/ffmpeg/xbmc.patch | 767 +++++++++++++++++++++ package/kodi/Makefile | 21 +- package/kodi/patches/patch-tools_Linux_xbmc_sh_in | 43 ++ package/kodi/patches/patch-xbmc_Application_cpp | 10 +- ..._cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp | 13 + 5 files changed, 837 insertions(+), 17 deletions(-) create mode 100644 package/ffmpeg/xbmc.patch create mode 100644 package/kodi/patches/patch-tools_Linux_xbmc_sh_in create mode 100644 package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp diff --git a/package/ffmpeg/xbmc.patch b/package/ffmpeg/xbmc.patch new file mode 100644 index 000000000..8a0ef64cd --- /dev/null +++ b/package/ffmpeg/xbmc.patch @@ -0,0 +1,767 @@ +From f68c860bdc70e440f047ca60c8f9497a0e5a2122 Mon Sep 17 00:00:00 2001 +From: Joakim Plate +Date: Sun, 11 Sep 2011 19:04:51 +0200 +Subject: [PATCH 01/15] Support raw dvdsub palette as stored on normal dvd's + +This is how the palette is stored on dvd's. Currently +only xbmc passes the palette information to libavcodec +this way. +--- + libavcodec/dvdsubdec.c | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c +index 39b0e25..a19086d 100644 +--- a/libavcodec/dvdsubdec.c ++++ b/libavcodec/dvdsubdec.c +@@ -61,6 +61,24 @@ static void yuv_a_to_rgba(const uint8_t *ycbcr, const uint8_t *alpha, uint32_t * + } + } + ++static void ayvu_to_argb(const uint8_t *ayvu, uint32_t *argb, int num_values) ++{ ++ uint8_t *cm = ff_crop_tab + MAX_NEG_CROP; ++ uint8_t r, g, b; ++ int i, y, cb, cr, a; ++ int r_add, g_add, b_add; ++ ++ for (i = num_values; i > 0; i--) { ++ a = *ayvu++; ++ y = *ayvu++; ++ cr = *ayvu++; ++ cb = *ayvu++; ++ YUV_TO_RGB1_CCIR(cb, cr); ++ YUV_TO_RGB2_CCIR(r, g, b, y); ++ *argb++ = (a << 24) | (r << 16) | (g << 8) | b; ++ } ++} ++ + static int decode_run_2bit(GetBitContext *gb, int *color) + { + unsigned int v, t; +@@ -628,6 +646,12 @@ static av_cold int dvdsub_init(AVCodecContext *avctx) + + if (ctx->palette_str) + parse_palette(ctx, ctx->palette_str); ++ ++ if (!ctx->has_palette && avctx->extradata_size == 64) { ++ ayvu_to_argb((uint8_t*)avctx->extradata, ctx->palette, 16); ++ ctx->has_palette = 1; ++ } ++ + if (ctx->has_palette) { + int i; + av_log(avctx, AV_LOG_DEBUG, "palette:"); +-- +1.9.3 + + +From d53ff2a91f95b2b6ef3974921228e90a4a765af6 Mon Sep 17 00:00:00 2001 +From: Joakim Plate +Date: Sat, 22 Oct 2011 18:33:45 +0200 +Subject: [PATCH 02/15] Check return value of avio_seek and avoid modifying + state if it fails + +The code still modifies state if the timestamp is not found. Not +sure exactly how to avoid that. +--- + libavformat/matroskadec.c | 23 ++++++++++++++--------- + 1 file changed, 14 insertions(+), 9 deletions(-) + +diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c +index ec43526..66d5e8e 100644 +--- a/libavformat/matroskadec.c ++++ b/libavformat/matroskadec.c +@@ -2992,8 +2992,8 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index, + timestamp = FFMAX(timestamp, st->index_entries[0].timestamp); + + if ((index = av_index_search_timestamp(st, timestamp, flags)) < 0) { +- avio_seek(s->pb, st->index_entries[st->nb_index_entries - 1].pos, +- SEEK_SET); ++ if (avio_seek(s->pb, st->index_entries[st->nb_index_entries-1].pos, SEEK_SET) < 0) ++ return -1; + matroska->current_id = 0; + while ((index = av_index_search_timestamp(st, timestamp, flags)) < 0) { + matroska_clear_queue(matroska); +@@ -3002,16 +3002,11 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index, + } + } + +- matroska_clear_queue(matroska); + if (index < 0 || (matroska->cues_parsing_deferred < 0 && index == st->nb_index_entries - 1)) + goto err; + + index_min = index; + for (i = 0; i < matroska->tracks.nb_elem; i++) { +- tracks[i].audio.pkt_cnt = 0; +- tracks[i].audio.sub_packet_cnt = 0; +- tracks[i].audio.buf_timecode = AV_NOPTS_VALUE; +- tracks[i].end_timecode = 0; + if (tracks[i].type == MATROSKA_TRACK_TYPE_SUBTITLE && + tracks[i].stream->discard != AVDISCARD_ALL) { + index_sub = av_index_search_timestamp( +@@ -3025,8 +3020,18 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index, + } + } + +- avio_seek(s->pb, st->index_entries[index_min].pos, SEEK_SET); +- matroska->current_id = 0; ++ if (avio_seek(s->pb, st->index_entries[index_min].pos, SEEK_SET) < 0) ++ return -1; ++ ++ matroska_clear_queue(matroska); ++ for (i=0; i < matroska->tracks.nb_elem; i++) { ++ tracks[i].audio.pkt_cnt = 0; ++ tracks[i].audio.sub_packet_cnt = 0; ++ tracks[i].audio.buf_timecode = AV_NOPTS_VALUE; ++ tracks[i].end_timecode = 0; ++ } ++ matroska->current_id = 0; ++ + if (flags & AVSEEK_FLAG_ANY) { + st->skip_to_keyframe = 0; + matroska->skip_to_timecode = timestamp; +-- +1.9.3 + + +From d8c6b50095900bbc4f40dfb3c2d321a35361820a Mon Sep 17 00:00:00 2001 +From: Joakim Plate +Date: Mon, 12 Sep 2011 21:37:17 +0200 +Subject: [PATCH 03/15] asf hacks + +--- + libavformat/asfdec.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c +index 978b956..30f099d 100644 +--- a/libavformat/asfdec.c ++++ b/libavformat/asfdec.c +@@ -1546,9 +1546,20 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, + AVStream *st = s->streams[stream_index]; + int ret = 0; + ++ if (pts == 0) { ++ // this is a hack since av_gen_search searches the entire file in this case ++ av_log(s, AV_LOG_DEBUG, "SEEKTO: %"PRId64"\n", s->data_offset); ++ if (avio_seek(s->pb, s->data_offset, SEEK_SET) < 0) ++ return -1; ++ return 0; ++ } ++ + if (s->packet_size <= 0) + return -1; + ++ if (st->codec->codec_type != AVMEDIA_TYPE_VIDEO) ++ return -1; ++ + /* Try using the protocol's read_seek if available */ + if (s->pb) { + int ret = avio_seek_time(s->pb, stream_index, pts, flags); +-- +1.9.3 + + +From bb32180f7e9fe2ff89888c26731dc043844b49e2 Mon Sep 17 00:00:00 2001 +From: Cory Fields +Date: Mon, 28 Jun 2010 01:55:31 -0400 +Subject: [PATCH 04/15] if av_read_packet returns AVERROR_IO, we are done. + ffmpeg's codecs might or might not handle returning any completed demuxed + packets correctly + +--- + libavformat/utils.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libavformat/utils.c b/libavformat/utils.c +index e095d60..9fa0bb0 100644 +--- a/libavformat/utils.c ++++ b/libavformat/utils.c +@@ -1460,6 +1460,8 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt) + if (ret < 0) { + if (ret == AVERROR(EAGAIN)) + return ret; ++ if (ret == AVERROR(EIO)) ++ return ret; + /* flush the parsers */ + for (i = 0; i < s->nb_streams; i++) { + st = s->streams[i]; +-- +1.9.3 + + +From aae4de70cac340ed7e1b8db34125216c1e13cb00 Mon Sep 17 00:00:00 2001 +From: Cory Fields +Date: Mon, 28 Jun 2010 02:10:50 -0400 +Subject: [PATCH 05/15] added: Ticket #7187, TV Teletext support for DVB EBU + Teletext streams + +--- + libavcodec/avcodec.h | 4 ++++ + libavformat/mpegts.c | 2 ++ + 2 files changed, 6 insertions(+) + +diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h +index 93ba4d0..f3de33a 100644 +--- a/libavcodec/avcodec.h ++++ b/libavcodec/avcodec.h +@@ -523,6 +523,10 @@ enum AVCodecID { + AV_CODEC_ID_PJS = MKBETAG('P','h','J','S'), + AV_CODEC_ID_ASS = MKBETAG('A','S','S',' '), ///< ASS as defined in Matroska + ++ /* data codecs */ ++ AV_CODEC_ID_VBI_DATA= 0x17500, ++ AV_CODEC_ID_VBI_TELETEXT, ++ + /* other specific kind of codecs (generally used for attachments) */ + AV_CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs. + AV_CODEC_ID_TTF = 0x18000, +diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c +index 7114088..e55193b 100644 +--- a/libavformat/mpegts.c ++++ b/libavformat/mpegts.c +@@ -708,6 +708,8 @@ static const StreamType DESC_types[] = { + { 0x7b, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS }, + { 0x56, AVMEDIA_TYPE_SUBTITLE, AV_CODEC_ID_DVB_TELETEXT }, + { 0x59, AVMEDIA_TYPE_SUBTITLE, AV_CODEC_ID_DVB_SUBTITLE }, /* subtitling descriptor */ ++ { 0x45, AVMEDIA_TYPE_DATA, AV_CODEC_ID_VBI_DATA }, /* VBI Data descriptor */ ++ { 0x46, AVMEDIA_TYPE_DATA, AV_CODEC_ID_VBI_TELETEXT }, /* VBI Teletext descriptor */ + { 0 }, + }; + +-- +1.9.3 + + +From e71d4c1755bd4e23fe9b65fb6128a8b41cecfdb1 Mon Sep 17 00:00:00 2001 +From: Joakim Plate +Date: Sun, 18 Sep 2011 19:16:34 +0200 +Subject: [PATCH 06/15] Don't accept mpegts PMT that isn't current + +--- + libavformat/mpegts.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c +index e55193b..9ec6220 100644 +--- a/libavformat/mpegts.c ++++ b/libavformat/mpegts.c +@@ -552,6 +552,7 @@ typedef struct SectionHeader { + uint8_t tid; + uint16_t id; + uint8_t version; ++ uint8_t current; + uint8_t sec_num; + uint8_t last_sec_num; + } SectionHeader; +@@ -623,6 +624,7 @@ static int parse_section_header(SectionHeader *h, + val = get8(pp, p_end); + if (val < 0) + return val; ++ h->current = val & 0x1; + h->version = (val >> 1) & 0x1f; + val = get8(pp, p_end); + if (val < 0) +@@ -1891,6 +1893,8 @@ static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len + return; + if (ts->skip_changes) + return; ++ if (!h->current) ++ return; + + ts->stream->ts_id = h->id; + +-- +1.9.3 + + +From 473091d11f4e3a0c1820054368a76074a0e239cb Mon Sep 17 00:00:00 2001 +From: Joakim Plate +Date: Sun, 18 Sep 2011 19:17:23 +0200 +Subject: [PATCH 07/15] Don't reparse PMT unless it's version has changed + +--- + libavformat/mpegts.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c +index 9ec6220..ab03372 100644 +--- a/libavformat/mpegts.c ++++ b/libavformat/mpegts.c +@@ -87,6 +87,7 @@ struct MpegTSFilter { + int es_id; + int last_cc; /* last cc code (-1 if first packet) */ + int64_t last_pcr; ++ int last_version; /* last version of data on this pid */ + enum MpegTSFilterType type; + union { + MpegTSPESFilter pes_filter; +@@ -432,6 +433,7 @@ static MpegTSFilter *mpegts_open_filter(MpegTSContext *ts, unsigned int pid, + filter->es_id = -1; + filter->last_cc = -1; + filter->last_pcr= -1; ++ filter->last_version = -1; + + return filter; + } +@@ -1895,6 +1897,10 @@ static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len + return; + if (!h->current) + return; ++ if (h->version == filter->last_version) ++ return; ++ filter->last_version = h->version; ++ av_dlog(ts->stream, "version=%d\n", filter->last_version); + + ts->stream->ts_id = h->id; + +-- +1.9.3 + + +From aa357f84bcdb105910478aee74d5b675d65114bd Mon Sep 17 00:00:00 2001 +From: Cory Fields +Date: Fri, 9 Jul 2010 16:43:31 -0400 +Subject: [PATCH 08/15] Read PID timestamps as well as PCR timestamps to find + location in mpegts stream + +--- + libavformat/mpegts.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 46 insertions(+), 2 deletions(-) + +diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c +index ab03372..9962ccf 100644 +--- a/libavformat/mpegts.c ++++ b/libavformat/mpegts.c +@@ -2375,6 +2375,44 @@ static void seek_back(AVFormatContext *s, AVIOContext *pb, int64_t pos) { + av_log(s, pb->seekable ? AV_LOG_ERROR : AV_LOG_INFO, "Unable to seek back to the start\n"); + } + ++static int parse_timestamp(int64_t *ts, const uint8_t *buf) ++{ ++ int afc, flags; ++ const uint8_t *p; ++ ++ if(!(buf[1] & 0x40)) /* must be a start packet */ ++ return -1; ++ ++ afc = (buf[3] >> 4) & 3; ++ p = buf + 4; ++ if (afc == 0 || afc == 2) /* invalid or only adaption field */ ++ return -1; ++ if (afc == 3) ++ p += p[0] + 1; ++ if (p >= buf + TS_PACKET_SIZE) ++ return -1; ++ ++ if (p[0] != 0x00 || p[1] != 0x00 || p[2] != 0x01) /* packet_start_code_prefix */ ++ return -1; ++ ++ flags = p[3] | 0x100; /* stream type */ ++ if (!((flags >= 0x1c0 && flags <= 0x1df) || ++ (flags >= 0x1e0 && flags <= 0x1ef) || ++ (flags == 0x1bd) || (flags == 0x1fd))) ++ return -1; ++ ++ flags = p[7]; ++ if ((flags & 0xc0) == 0x80) { ++ *ts = ff_parse_pes_pts(p+9); ++ return 0; ++ } else if ((flags & 0xc0) == 0xc0) { ++ *ts = ff_parse_pes_pts(p+9+5); ++ return 0; ++ } ++ return -1; ++} ++ ++ + static int mpegts_read_header(AVFormatContext *s) + { + MpegTSContext *ts = s->priv_data; +@@ -2574,6 +2612,7 @@ static av_unused int64_t mpegts_get_pcr(AVFormatContext *s, int stream_index, + uint8_t buf[TS_PACKET_SIZE]; + int pcr_l, pcr_pid = + ((PESContext *)s->streams[stream_index]->priv_data)->pcr_pid; ++ int pid = ((PESContext*)s->streams[stream_index]->priv_data)->pid; + int pos47 = ts->pos47_full % ts->raw_packet_size; + pos = + ((*ppos + ts->raw_packet_size - 1 - pos47) / ts->raw_packet_size) * +@@ -2595,6 +2634,11 @@ static av_unused int64_t mpegts_get_pcr(AVFormatContext *s, int stream_index, + *ppos = pos; + return timestamp; + } ++ if ((pid < 0 || (AV_RB16(buf + 1) & 0x1fff) == pid) && ++ parse_timestamp(×tamp, buf) == 0) { ++ *ppos = pos; ++ return timestamp; ++ } + pos += ts->raw_packet_size; + } + +@@ -2694,7 +2738,7 @@ AVInputFormat ff_mpegts_demuxer = { + .read_header = mpegts_read_header, + .read_packet = mpegts_read_packet, + .read_close = mpegts_read_close, +- .read_timestamp = mpegts_get_dts, ++ .read_timestamp = mpegts_get_pcr, + .flags = AVFMT_SHOW_IDS | AVFMT_TS_DISCONT, + .priv_class = &mpegts_class, + }; +@@ -2706,7 +2750,7 @@ AVInputFormat ff_mpegtsraw_demuxer = { + .read_header = mpegts_read_header, + .read_packet = mpegts_raw_read_packet, + .read_close = mpegts_read_close, +- .read_timestamp = mpegts_get_dts, ++ .read_timestamp = mpegts_get_pcr, + .flags = AVFMT_SHOW_IDS | AVFMT_TS_DISCONT, + .priv_class = &mpegtsraw_class, + }; +-- +1.9.3 + + +From 8deda04d599f1e248cba4d175257dea469feb719 Mon Sep 17 00:00:00 2001 +From: Joakim Plate +Date: Sat, 22 Oct 2011 19:01:38 +0200 +Subject: [PATCH 09/15] Get stream durations using read_timestamp + +--- + libavformat/utils.c | 39 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 39 insertions(+) + +diff --git a/libavformat/utils.c b/libavformat/utils.c +index 9fa0bb0..cbeaa9c 100644 +--- a/libavformat/utils.c ++++ b/libavformat/utils.c +@@ -2480,6 +2480,41 @@ static void estimate_timings_from_bit_rate(AVFormatContext *ic) + #define DURATION_MAX_READ_SIZE 250000LL + #define DURATION_MAX_RETRY 4 + ++static void av_estimate_timings_from_pts2(AVFormatContext *ic, int64_t old_offset) ++{ ++ AVStream *st; ++ int i, step= 1024; ++ int64_t ts, pos; ++ ++ for(i=0;inb_streams;i++) { ++ st = ic->streams[i]; ++ ++ pos = 0; ++ ts = ic->iformat->read_timestamp(ic, i, &pos, DURATION_MAX_READ_SIZE); ++ if (ts == AV_NOPTS_VALUE) ++ continue; ++ if (st->start_time > ts || st->start_time == AV_NOPTS_VALUE) ++ st->start_time = ts; ++ ++ pos = avio_size(ic->pb) - 1; ++ do { ++ pos -= step; ++ ts = ic->iformat->read_timestamp(ic, i, &pos, pos + step); ++ step += step; ++ } while (ts == AV_NOPTS_VALUE && pos >= step && step < DURATION_MAX_READ_SIZE); ++ ++ if (ts == AV_NOPTS_VALUE) ++ continue; ++ ++ if (st->duration < ts - st->start_time || st->duration == AV_NOPTS_VALUE) ++ st->duration = ts - st->start_time; ++ } ++ ++ fill_all_stream_timings(ic); ++ ++ avio_seek(ic->pb, old_offset, SEEK_SET); ++} ++ + /* only usable for MPEG-PS streams */ + static void estimate_timings_from_pts(AVFormatContext *ic, int64_t old_offset) + { +@@ -2630,6 +2665,10 @@ static void estimate_timings(AVFormatContext *ic, int64_t old_offset) + * the components */ + fill_all_stream_timings(ic); + ic->duration_estimation_method = AVFMT_DURATION_FROM_STREAM; ++ } else if (ic->iformat->read_timestamp && ++ file_size && ic->pb->seekable) { ++ /* get accurate estimate from the PTSes */ ++ av_estimate_timings_from_pts2(ic, old_offset); + } else { + /* less precise: use bitrate info */ + estimate_timings_from_bit_rate(ic); +-- +1.9.3 + + +From 77caa1aab9b838a0085e2f4133d0e27eb6588f4b Mon Sep 17 00:00:00 2001 +From: Joakim Plate +Date: Wed, 8 Dec 2010 14:03:43 +0000 +Subject: [PATCH 10/15] changed: allow 4 second skew between streams in mov + before attempting to seek + +--- + libavformat/mov.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libavformat/mov.c b/libavformat/mov.c +index 9b4832f..41be8b7 100644 +--- a/libavformat/mov.c ++++ b/libavformat/mov.c +@@ -3673,8 +3673,8 @@ static AVIndexEntry *mov_find_next_sample(AVFormatContext *s, AVStream **st) + if (!sample || (!s->pb->seekable && current_sample->pos < sample->pos) || + (s->pb->seekable && + ((msc->pb != s->pb && dts < best_dts) || (msc->pb == s->pb && +- ((FFABS(best_dts - dts) <= AV_TIME_BASE && current_sample->pos < sample->pos) || +- (FFABS(best_dts - dts) > AV_TIME_BASE && dts < best_dts)))))) { ++ ((FFABS(best_dts - dts) <= 4*AV_TIME_BASE && current_sample->pos < sample->pos) || ++ (FFABS(best_dts - dts) > 4*AV_TIME_BASE && dts < best_dts)))))) { + sample = current_sample; + best_dts = dts; + *st = avst; +-- +1.9.3 + + +From c3d69fb6f71a674310fefb17aebab01a6744881c Mon Sep 17 00:00:00 2001 +From: Joakim Plate +Date: Fri, 26 Nov 2010 20:56:48 +0000 +Subject: [PATCH 11/15] fixed: memleak in mpegts demuxer on some malformed (??) + mpegts files with too large pes packets + +at-visions sample file brokenStream.mpg +--- + libavformat/mpegts.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c +index 9962ccf..66ea11c 100644 +--- a/libavformat/mpegts.c ++++ b/libavformat/mpegts.c +@@ -811,6 +811,10 @@ static void reset_pes_packet_state(PESContext *pes) + + static void new_pes_packet(PESContext *pes, AVPacket *pkt) + { ++ if(pkt->data) { ++ av_log(pes->stream, AV_LOG_ERROR, "ignoring previously allocated packet on stream %d\n", pkt->stream_index); ++ av_free_packet(pkt); ++ } + av_init_packet(pkt); + + pkt->buf = pes->buffer; +@@ -2565,6 +2569,8 @@ static int mpegts_read_packet(AVFormatContext *s, AVPacket *pkt) + + pkt->size = -1; + ts->pkt = pkt; ++ ts->pkt->data = NULL; ++ + ret = handle_packets(ts, 0); + if (ret < 0) { + av_free_packet(ts->pkt); +-- +1.9.3 + + +From e621e2b83b43a5fade298251094458451eecad41 Mon Sep 17 00:00:00 2001 +From: Joakim Plate +Date: Mon, 28 Jun 2010 21:26:54 +0000 +Subject: [PATCH 12/15] Speed up mpegts av_find_stream_info + +--- + libavformat/mpegts.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c +index 66ea11c..5811d26 100644 +--- a/libavformat/mpegts.c ++++ b/libavformat/mpegts.c +@@ -969,7 +969,7 @@ static int mpegts_push_data(MpegTSFilter *filter, + goto skip; + + /* stream not present in PMT */ +- if (!pes->st) { ++ if (ts->auto_guess && !pes->st) { + if (ts->skip_changes) + goto skip; + +-- +1.9.3 + + +From 07a31ecbe3493cbc1d1a5b6dee7784257a70ca17 Mon Sep 17 00:00:00 2001 +From: marc +Date: Mon, 18 Feb 2013 17:18:18 +0000 +Subject: [PATCH 13/15] dxva-h264 Fix dxva playback of streams that don't start + with an I-Frame. + +--- + libavcodec/dxva2_h264.c | 8 ++++++++ + libavcodec/h264.c | 1 + + libavcodec/h264.h | 2 ++ + libavcodec/h264_slice.c | 1 + + 4 files changed, 12 insertions(+) + +diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c +index 1174188..263a272 100644 +--- a/libavcodec/dxva2_h264.c ++++ b/libavcodec/dxva2_h264.c +@@ -448,6 +448,14 @@ static int dxva2_h264_end_frame(AVCodecContext *avctx) + + if (ctx_pic->slice_count <= 0 || ctx_pic->bitstream_size <= 0) + return -1; ++ ++ // Wait for an I-frame before start decoding. Workaround for ATI UVD and UVD+ GPUs ++ if (!h->got_first_iframe) { ++ if (!(ctx_pic->pp.wBitFields & (1 << 15))) ++ return -1; ++ h->got_first_iframe = 1; ++ } ++ + ret = ff_dxva2_common_end_frame(avctx, &h->cur_pic_ptr->f, + &ctx_pic->pp, sizeof(ctx_pic->pp), + &ctx_pic->qm, sizeof(ctx_pic->qm), +diff --git a/libavcodec/h264.c b/libavcodec/h264.c +index 1d91987..8b7b026 100644 +--- a/libavcodec/h264.c ++++ b/libavcodec/h264.c +@@ -1085,6 +1085,7 @@ void ff_h264_flush_change(H264Context *h) + h->list_count = 0; + h->current_slice = 0; + h->mmco_reset = 1; ++ h->got_first_iframe = 0; + } + + /* forget old pics after a seek */ +diff --git a/libavcodec/h264.h b/libavcodec/h264.h +index 228558b..5e92043 100644 +--- a/libavcodec/h264.h ++++ b/libavcodec/h264.h +@@ -740,6 +740,8 @@ typedef struct H264Context { + int luma_weight_flag[2]; ///< 7.4.3.2 luma_weight_lX_flag + int chroma_weight_flag[2]; ///< 7.4.3.2 chroma_weight_lX_flag + ++ int got_first_iframe; ++ + // Timestamp stuff + int sei_buffering_period_present; ///< Buffering period SEI flag + int initial_cpb_removal_delay[32]; ///< Initial timestamps for CPBs +diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c +index ded26f8..e20f2c8 100644 +--- a/libavcodec/h264_slice.c ++++ b/libavcodec/h264_slice.c +@@ -1166,6 +1166,7 @@ static int h264_slice_header_init(H264Context *h, int reinit) + ff_h264_free_tables(h, 0); + h->first_field = 0; + h->prev_interlaced_frame = 1; ++ h->got_first_iframe = 0; + + init_scan_tables(h); + ret = ff_h264_alloc_tables(h); +-- +1.9.3 + + +From 67247a541dc1dfb547d35eb326ecf26b6c10b4d3 Mon Sep 17 00:00:00 2001 +From: elupus +Date: Tue, 1 Nov 2011 20:18:35 +0100 +Subject: [PATCH 14/15] add public version of ff_read_frame_flush + +We need this since we sometimes seek on the +input stream behind ffmpeg's back. After this +all data need to be flushed completely. +--- + libavformat/avformat.h | 5 +++++ + libavformat/utils.c | 5 +++++ + 2 files changed, 10 insertions(+) + +diff --git a/libavformat/avformat.h b/libavformat/avformat.h +index a9abfbd..ff19215 100644 +--- a/libavformat/avformat.h ++++ b/libavformat/avformat.h +@@ -2074,6 +2074,11 @@ int av_read_packet(AVFormatContext *s, AVPacket *pkt); + int av_read_frame(AVFormatContext *s, AVPacket *pkt); + + /** ++ * Clear out any buffered data in context ++ */ ++void av_read_frame_flush(AVFormatContext *s); ++ ++/** + * Seek to the keyframe at timestamp. + * 'timestamp' in 'stream_index'. + * +diff --git a/libavformat/utils.c b/libavformat/utils.c +index cbeaa9c..185706f 100644 +--- a/libavformat/utils.c ++++ b/libavformat/utils.c +@@ -1748,6 +1748,11 @@ void ff_read_frame_flush(AVFormatContext *s) + } + } + ++void av_read_frame_flush(AVFormatContext *s) ++{ ++ ff_read_frame_flush(s); ++} ++ + void ff_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp) + { + int i; +-- +1.9.3 + + +From d028c907004e8a3c0f5161ce595331e4cc57c86c Mon Sep 17 00:00:00 2001 +From: Memphiz +Date: Mon, 12 May 2014 18:27:01 +0200 +Subject: [PATCH 15/15] fix --disable-ffplay should disable any needs to check + or add compile/link flags otherwise SDL gets spewed all over pkg-config files + and generally causes a mess + +--- + configure | 32 +++++++++++++++++--------------- + 1 file changed, 17 insertions(+), 15 deletions(-) + +diff --git a/configure b/configure +index 4ed43a0..4520e8c 100755 +--- a/configure ++++ b/configure +@@ -4827,22 +4827,24 @@ if enabled libdc1394; then + die "ERROR: No version of libdc1394 found " + fi + +-SDL_CONFIG="${cross_prefix}sdl-config" +-if check_pkg_config sdl SDL_events.h SDL_PollEvent; then +- check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags && +- check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x010300" $sdl_cflags && +- enable sdl +-else +- if "${SDL_CONFIG}" --version > /dev/null 2>&1; then +- sdl_cflags=$("${SDL_CONFIG}" --cflags) +- sdl_libs=$("${SDL_CONFIG}" --libs) +- check_func_headers SDL_version.h SDL_Linked_Version $sdl_cflags $sdl_libs && +- check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags && +- check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x010300" $sdl_cflags && +- enable sdl +- fi ++if enabled ffplay; then ++ SDL_CONFIG="${cross_prefix}sdl-config" ++ if check_pkg_config sdl SDL_events.h SDL_PollEvent; then ++ check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags && ++ check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x010300" $sdl_cflags && ++ enable sdl ++ else ++ if "${SDL_CONFIG}" --version > /dev/null 2>&1; then ++ sdl_cflags=$("${SDL_CONFIG}" --cflags) ++ sdl_libs=$("${SDL_CONFIG}" --libs) ++ check_func_headers SDL_version.h SDL_Linked_Version $sdl_cflags $sdl_libs && ++ check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags && ++ check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x010300" $sdl_cflags && ++ enable sdl ++ fi ++ fi ++ enabled sdl && add_cflags $sdl_cflags && add_extralibs $sdl_libs + fi +-enabled sdl && add_cflags $sdl_cflags && add_extralibs $sdl_libs + + texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disable texi2html + makeinfo --version > /dev/null 2>&1 && enable makeinfo || disable makeinfo +-- +1.9.3 + diff --git a/package/kodi/Makefile b/package/kodi/Makefile index 7d2335cab..4ffffbc18 100644 --- a/package/kodi/Makefile +++ b/package/kodi/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kodi -PKG_VERSION:= 14.0alpha3 +PKG_VERSION:= 14.0alpha4 PKG_RELEASE:= 1 -PKG_MD5SUM:= 76951db1b343b118e6b2a4e7411fabd9 +PKG_MD5SUM:= 5bd39942150249d9eccf792d77b92554 PKG_DESCR:= software media player PKG_SECTION:= mm/video PKG_DEPENDS:= boost python2 libstdcxx glibc-gconv @@ -63,11 +63,7 @@ PKG_DEPENDS_RASPBERRY_PI:= bcm2835-vc PKG_BUILDDEP_RASPBERRY_PI:= bcm2835-vc PKG_DEPENDS_SOLIDRUN_IMX6:= libfslvpuwrap gpu-viv-bin-mx6q PKG_BUILDDEP_SOLIDRUN_IMX6:= libfslvpuwrap gpu-viv-bin-mx6q -PKG_DEPENDS_IBM_X40:= libsdl libsdl-image libxshmfence libx11 libxext libxt libsm libice -PKG_DEPENDS_VBOX_X86:= libsdl libsdl-image libxshmfence libx11 libxext libxt libsm libice -PKG_BUILDDEP_IBM_X40:= nasm-host sdl sdl-image -PKG_BUILDDEP_VBOX_X86:= nasm-host sdl sdl-image -PKG_SYSTEM_DEPENDS:= raspberry-pi ibm-x40 vbox-x86 solidrun-imx6 +PKG_SYSTEM_DEPENDS:= raspberry-pi solidrun-imx6 DIFF_IGNOREFILES:= configure missing depcomp install-sh INSTALL \ aclocal.m4 config.h.in @@ -97,7 +93,6 @@ CONFIGURE_ARGS+= --disable-optical-drive \ --disable-mysql \ --disable-rsxs \ --disable-projectm \ - --disable-crystalhd \ --disable-mdnsembedded \ --disable-libusb \ --disable-libcap \ @@ -110,11 +105,8 @@ CONFIGURE_ARGS+= --disable-optical-drive \ --disable-pulse \ --disable-mid \ --enable-alsa \ - --enable-libmp3lame \ --enable-libvorbisenc \ - --enable-udev \ - --with-ffmpeg \ - --enable-external-libraries + --enable-udev ifneq ($(ADK_PACKAGE_XBMC_WITH_BLURAY),) CONFIGURE_ARGS+= --enable-libbluray @@ -184,6 +176,11 @@ endif pre-configure: (cd $(WRKBUILD)/lib/cpluff && env PATH=$(AUTOTOOL_PATH) ./autogen.sh) +pre-build: + make CXX="${HOST_CXX}" CC="${HOST_CC}" CFLAGS="${HOST_CFLAGS}" \ + CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}" \ + -C $(WRKBUILD)/tools/depends/native/JsonSchemaBuilder + kodi-install: $(INSTALL_DIR) $(IDIR_KODI)/usr/lib/xbmc/addons $(CP) $(WRKINST)/usr/lib/xbmc/* \ diff --git a/package/kodi/patches/patch-tools_Linux_xbmc_sh_in b/package/kodi/patches/patch-tools_Linux_xbmc_sh_in new file mode 100644 index 000000000..1420f2c1b --- /dev/null +++ b/package/kodi/patches/patch-tools_Linux_xbmc_sh_in @@ -0,0 +1,43 @@ +--- kodi-14.0alpha4.orig/tools/Linux/xbmc.sh.in 2014-09-05 14:09:59.000000000 +0200 ++++ kodi-14.0alpha4/tools/Linux/xbmc.sh.in 2014-09-05 18:56:32.792578871 +0200 +@@ -58,7 +58,7 @@ single_stacktrace() + + print_crash_report() + { +- FILE="$CRASHLOG_DIR/xbmc_crashlog-`date +%Y%m%d_%H%M%S`.log" ++ FILE="/tmp/xbmc_crashlog-`date +%Y%m%d_%H%M%S`.log" + echo "############## XBMC CRASH LOG ###############" >> $FILE + echo >> $FILE + echo "################ SYSTEM INFO ################" >> $FILE +@@ -100,31 +100,8 @@ print_crash_report() + echo "gdb not installed, can't get stack trace." >> $FILE + fi + echo "############# END STACK TRACE ###############" >> $FILE +- echo >> $FILE +- echo "################# LOG FILE ##################" >> $FILE +- echo >> $FILE +- if [ -f ~/.xbmc/temp/xbmc.log ] +- then +- cat ~/.xbmc/temp/xbmc.log >> $FILE +- echo >> $FILE +- else +- echo "Logfile not found in the usual place." >> $FILE +- echo "Please attach it seperately." >> $FILE +- echo "Use pastebin.com or similar for forums or IRC." >> $FILE +- fi +- echo >> $FILE +- echo "############### END LOG FILE ################" >> $FILE +- echo >> $FILE +- echo "############ END XBMC CRASH LOG #############" >> $FILE +- echo "Crash report available at $FILE" + } + +-python @datadir@/xbmc/FEH.py $SAVED_ARGS +-RET=$? +-if [ $RET -ne 0 ]; then +- exit $RET +-fi +- + if command_exists gdb; then + # Output warning in case ulimit is unsupported by shell + eval ulimit -c unlimited diff --git a/package/kodi/patches/patch-xbmc_Application_cpp b/package/kodi/patches/patch-xbmc_Application_cpp index 906ba1222..b8a942c03 100644 --- a/package/kodi/patches/patch-xbmc_Application_cpp +++ b/package/kodi/patches/patch-xbmc_Application_cpp @@ -1,6 +1,6 @@ ---- xbmc-13.1.orig/xbmc/Application.cpp 2014-06-08 08:40:26.000000000 +0200 -+++ xbmc-13.1/xbmc/Application.cpp 2014-06-08 09:42:40.232780377 +0200 -@@ -682,7 +682,7 @@ bool CApplication::Create() +--- kodi-14.0alpha4.orig/xbmc/Application.cpp 2014-09-05 14:09:59.000000000 +0200 ++++ kodi-14.0alpha4/xbmc/Application.cpp 2014-09-05 15:48:59.475115902 +0200 +@@ -679,7 +679,7 @@ bool CApplication::Create() if (!CLog::Init(CSpecialProtocol::TranslatePath(g_advancedSettings.m_logFolder).c_str())) { @@ -9,7 +9,7 @@ CSpecialProtocol::TranslatePath(g_advancedSettings.m_logFolder).c_str()); return false; } -@@ -1085,10 +1085,13 @@ bool CApplication::InitDirectoriesLinux( +@@ -1090,10 +1090,13 @@ bool CApplication::InitDirectoriesLinux( userName = "root"; CStdString userHome; @@ -23,7 +23,7 @@ CStdString xbmcBinPath, xbmcPath; CUtil::GetHomePath(xbmcBinPath, "XBMC_BIN_HOME"); -@@ -1120,11 +1123,11 @@ bool CApplication::InitDirectoriesLinux( +@@ -1125,11 +1128,11 @@ bool CApplication::InitDirectoriesLinux( // map our special drives CSpecialProtocol::SetXBMCBinPath(xbmcBinPath); CSpecialProtocol::SetXBMCPath(xbmcPath); diff --git a/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp new file mode 100644 index 000000000..0be4452a8 --- /dev/null +++ b/package/kodi/patches/patch-xbmc_cores_dvdplayer_DVDDemuxers_DVDDemuxFFmpeg_cpp @@ -0,0 +1,13 @@ +--- kodi-14.0alpha4.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-09-05 14:09:59.000000000 +0200 ++++ kodi-14.0alpha4/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-09-05 15:53:47.432904545 +0200 +@@ -490,8 +490,8 @@ void CDVDDemuxFFmpeg::Reset() + void CDVDDemuxFFmpeg::Flush() + { + // naughty usage of an internal ffmpeg function +- if (m_pFormatContext) +- av_read_frame_flush(m_pFormatContext); ++ //if (m_pFormatContext) ++ // av_read_frame_flush(m_pFormatContext); + + m_iCurrentPts = DVD_NOPTS_VALUE; + -- cgit v1.2.3