X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fstream.c;h=b50dff15e607d12a6a1547e44f3c76da9245025e;hb=368f30692dba8e93b56ae69e0f4b902e2940f56f;hp=b3942859c14babe4891527d627f4e89216c2be52;hpb=6b0fbacac1046b9bdc7df50f109e90d49690e801;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/stream.c b/libhb/stream.c old mode 100755 new mode 100644 index b3942859..b50dff15 --- a/libhb/stream.c +++ b/libhb/stream.c @@ -9,10 +9,10 @@ #include #include "hb.h" +#include "hbffmpeg.h" #include "lang.h" #include "a52dec/a52.h" -#include "libavcodec/avcodec.h" -#include "libavformat/avformat.h" +#include "mp4v2/mp4v2.h" #define min(a, b) a < b ? a : b @@ -26,55 +26,52 @@ * doesn't handle the stream type. */ typedef struct { - enum { U, A, V } kind; /* unknown / audio / video */ + enum { N, U, A, V } kind; /* not handled / unknown / audio / video */ int codec; /* HB worker object id of codec */ int codec_param; /* param for codec (usually ffmpeg codec id) */ const char* name; /* description of type */ - int extra_hdr; /* needs a substream header added to PS pack */ } stream2codec_t; #define st(id, kind, codec, codec_param, name) \ - [id] = { kind, codec, codec_param, name, 0 } -#define se(id, kind, codec, codec_param, name) \ - [id] = { kind, codec, codec_param, name, 1 } + [id] = { kind, codec, codec_param, name } static const stream2codec_t st2codec[256] = { st(0x01, V, WORK_DECMPEG2, 0, "MPEG1"), st(0x02, V, WORK_DECMPEG2, 0, "MPEG2"), st(0x03, A, HB_ACODEC_MPGA, CODEC_ID_MP2, "MPEG1"), st(0x04, A, HB_ACODEC_MPGA, CODEC_ID_MP2, "MPEG2"), - st(0x05, U, 0, 0, "ISO 13818-1 private section"), + st(0x05, N, 0, 0, "ISO 13818-1 private section"), st(0x06, U, 0, 0, "ISO 13818-1 PES private data"), - st(0x07, U, 0, 0, "ISO 13522 MHEG"), - st(0x08, U, 0, 0, "ISO 13818-1 DSM-CC"), - st(0x09, U, 0, 0, "ISO 13818-1 auxiliary"), - st(0x0a, U, 0, 0, "ISO 13818-6 encap"), - st(0x0b, U, 0, 0, "ISO 13818-6 DSM-CC U-N msgs"), - st(0x0c, U, 0, 0, "ISO 13818-6 Stream descriptors"), - st(0x0d, U, 0, 0, "ISO 13818-6 Sections"), - st(0x0e, U, 0, 0, "ISO 13818-1 auxiliary"), + st(0x07, N, 0, 0, "ISO 13522 MHEG"), + st(0x08, N, 0, 0, "ISO 13818-1 DSM-CC"), + st(0x09, N, 0, 0, "ISO 13818-1 auxiliary"), + st(0x0a, N, 0, 0, "ISO 13818-6 encap"), + st(0x0b, N, 0, 0, "ISO 13818-6 DSM-CC U-N msgs"), + st(0x0c, N, 0, 0, "ISO 13818-6 Stream descriptors"), + st(0x0d, N, 0, 0, "ISO 13818-6 Sections"), + st(0x0e, N, 0, 0, "ISO 13818-1 auxiliary"), st(0x0f, A, HB_ACODEC_MPGA, CODEC_ID_AAC, "ISO 13818-7 AAC Audio"), st(0x10, V, WORK_DECAVCODECV, CODEC_ID_MPEG4, "MPEG4"), st(0x11, A, HB_ACODEC_MPGA, CODEC_ID_AAC_LATM, "MPEG4 LATM AAC"), st(0x12, U, 0, 0, "MPEG4 generic"), - st(0x14, U, 0, 0, "ISO 13818-6 DSM-CC download"), + st(0x14, N, 0, 0, "ISO 13818-6 DSM-CC download"), st(0x1b, V, WORK_DECAVCODECV, CODEC_ID_H264, "H.264"), - st(0x80, U, 0, 0, "DigiCipher II Video"), - se(0x81, A, HB_ACODEC_AC3, 0, "AC-3"), - se(0x82, A, HB_ACODEC_DCA, 0, "HDMV DTS"), + st(0x80, N, 0, 0, "DigiCipher II Video"), + st(0x81, A, HB_ACODEC_AC3, 0, "AC-3"), + st(0x82, A, HB_ACODEC_DCA, 0, "HDMV DTS"), st(0x83, A, HB_ACODEC_LPCM, 0, "LPCM"), st(0x84, A, 0, 0, "SDDS"), st(0x85, U, 0, 0, "ATSC Program ID"), - st(0x86, U, 0, 0, "SCTE 35 splice info"), + st(0x86, A, HB_ACODEC_DCA, 0, "DTS-HD"), st(0x87, A, 0, 0, "E-AC-3"), - se(0x8a, A, HB_ACODEC_DCA, 0, "DTS"), + st(0x8a, A, HB_ACODEC_DCA, 0, "DTS"), - se(0x91, A, HB_ACODEC_AC3, 0, "AC-3"), - st(0x92, U, 0, 0, "Subtitle"), + st(0x91, A, HB_ACODEC_AC3, 0, "AC-3"), + st(0x92, N, 0, 0, "Subtitle"), st(0x94, A, 0, 0, "SDDS"), st(0xa0, V, 0, 0, "MSCODEC"), @@ -105,19 +102,23 @@ struct hb_stream_s int last_error_count; /* # errors at last error message */ int packetsize; /* Transport Stream packet size */ - int64_t ts_lastpcr; /* the last pcr we found in the TS stream */ - int64_t ts_nextpcr; /* the next pcr to put in a PS packet */ + uint8_t need_keyframe; // non-zero if want to start at a keyframe + uint8_t ts_found_pcr; // non-zero if we've found at least one input pcr + int ts_pcr_out; // sequence number of most recent output pcr + int ts_pcr_in; // sequence number of most recent input pcr + int64_t ts_pcr; // most recent input pcr + int64_t ts_pcrhist[4]; // circular buffer of output pcrs uint8_t *ts_packet; /* buffer for one TS packet */ - uint8_t *ts_buf[kMaxNumberDecodeStreams]; + hb_buffer_t *ts_buf[kMaxNumberDecodeStreams]; int ts_pos[kMaxNumberDecodeStreams]; - int8_t ts_foundfirst[kMaxNumberDecodeStreams]; int8_t ts_skipbad[kMaxNumberDecodeStreams]; int8_t ts_streamcont[kMaxNumberDecodeStreams]; - int8_t ts_start[kMaxNumberDecodeStreams]; - uint8_t *fwrite_buf; /* PS buffer (set by hb_ts_stream_decode) */ - uint8_t *fwrite_buf_orig; /* PS buffer start (set by hb_ts_stream_decode) */ + hb_buffer_t *fwrite_buf; /* PS buffer (set by hb_ts_stream_decode) */ + + int chapter; /* Chapter that we are currently in */ + uint64_t chapter_end; /* HB time that the current chapter ends */ /* * Stuff before this point is dynamic state updated as we read the @@ -127,13 +128,19 @@ struct hb_stream_s */ uint8_t ts_number_video_pids; uint8_t ts_number_audio_pids; + uint8_t ts_flags; // stream characteristics: +#define TS_HAS_PCR (1 << 0) // at least one PCR seen +#define TS_HAS_RAP (1 << 1) // Random Access Point bit seen +#define TS_HAS_RSEI (1 << 2) // "Restart point" SEI seen + uint8_t ts_IDRs; // # IDRs found during duration scan int16_t ts_video_pids[kMaxNumberVideoPIDS]; int16_t ts_audio_pids[kMaxNumberAudioPIDS]; - uint8_t ts_streamid[kMaxNumberDecodeStreams]; + uint32_t ts_format_id[kMaxNumberDecodeStreams]; +#define TS_FORMAT_ID_AC3 (('A' << 24) | ('C' << 16) | ('-' << 8) | '3') uint8_t ts_stream_type[kMaxNumberDecodeStreams]; - uint8_t ts_extra_hdr[kMaxNumberDecodeStreams]; + uint8_t ts_multiplexed[kMaxNumberDecodeStreams]; char *path; FILE *file_handle; @@ -143,6 +150,7 @@ struct hb_stream_s AVFormatContext *ffmpeg_ic; AVPacket *ffmpeg_pkt; double ffmpeg_tsconv[MAX_STREAMS]; + uint8_t ffmpeg_video_id; struct { int lang_code; @@ -186,7 +194,7 @@ struct hb_stream_s static void hb_stream_duration(hb_stream_t *stream, hb_title_t *inTitle); static void hb_ts_stream_init(hb_stream_t *stream); static void hb_ts_stream_find_pids(hb_stream_t *stream); -static int hb_ts_stream_decode(hb_stream_t *stream, uint8_t *obuf); +static int hb_ts_stream_decode(hb_stream_t *stream, hb_buffer_t *obuf); static void hb_ts_stream_reset(hb_stream_t *stream); static hb_audio_t *hb_ts_stream_set_audio_id_and_codec(hb_stream_t *stream, int aud_pid_index); @@ -295,14 +303,13 @@ static int check_ps_sync(const uint8_t *buf) (buf[2] == 0x01) && (buf[3] == 0xba); } -static int check_ps_sys(const uint8_t *buf) +static int check_ps_sc(const uint8_t *buf) { // a legal MPEG program stream must start with a Pack followed by a - // SYS. If we've already verified the pack, this skips over it and checks - // for the sys header. + // some other start code. If we've already verified the pack, this skip + // it and checks for a start code prefix. int pos = 14 + ( buf[13] & 0x7 ); // skip over the PACK - return (buf[pos+0] == 0x00) && (buf[pos+1] == 0x00) && - (buf[pos+2] == 0x01) && (buf[pos+3] == 0xbb); + return (buf[pos+0] == 0x00) && (buf[pos+1] == 0x00) && (buf[pos+2] == 0x01); } static int check_ts_sync(const uint8_t *buf) @@ -342,8 +349,9 @@ static int hb_stream_check_for_ts(const uint8_t *buf) static int hb_stream_check_for_ps(const uint8_t *buf) { - // program streams should start with a PACK then a SYS header. - return check_ps_sync(buf) && check_ps_sys(buf); + // program streams should start with a PACK then some other mpeg start + // code (usually a SYS but that might be missing if we only have a clip). + return check_ps_sync(buf) && check_ps_sc(buf); } static int hb_stream_check_for_dvd_ps(const uint8_t *buf) @@ -411,7 +419,7 @@ static void hb_stream_delete_dynamic( hb_stream_t *d ) { if (d->ts_buf[i]) { - free(d->ts_buf[i]); + hb_buffer_close(&(d->ts_buf[i])); d->ts_buf[i] = NULL; } } @@ -424,6 +432,37 @@ static void hb_stream_delete( hb_stream_t *d ) free( d ); } +static int audio_inactive( hb_stream_t *stream, int indx ) +{ + int aud_indx = indx - 1; + + if ( stream->ts_audio_pids[aud_indx] < 0 ) + { + // PID declared inactive by hb_stream_title_scan + return 1; + } + if ( stream->ts_audio_pids[aud_indx] == stream->pmt_info.PCR_PID ) + { + // PCR PID is always active + return 0; + } + + // see if we should make the stream inactive because scan.c didn't + // find a valid audio bitstream. + int i; + for ( i = 0; i < hb_list_count( stream->title->list_audio ); ++i ) + { + hb_audio_t *audio = hb_list_item( stream->title->list_audio, i ); + if ( audio->id == indx ) + { + return 0; + } + } + // not in the title's audio list - declare the PID inactive + stream->ts_audio_pids[aud_indx] = -stream->ts_audio_pids[aud_indx]; + return 1; +} + /*********************************************************************** * hb_stream_open *********************************************************************** @@ -471,16 +510,16 @@ hb_stream_t * hb_stream_open( char *path, hb_title_t *title ) int i = 0; for ( ; i < d->ts_number_video_pids + d->ts_number_audio_pids; i++) { - d->ts_buf[i] = malloc( HB_DVD_READ_BUFFER_SIZE ); + if ( i && audio_inactive( d, i ) ) + { + // this PID isn't wanted (we don't have a codec for it + // or scan didn't find audio parameters) + continue; + } + d->ts_buf[i] = hb_buffer_init(d->packetsize); + d->ts_buf[i]->size = 0; } hb_stream_seek( d, 0. ); - - if ( d->packetsize == 188 ) - { - // Assume that an over-the-air transport stream can lose PCR - // packets and try to filter out the timing inconsistencies. - title->flaky_clock = 1; - } } return d; } @@ -572,20 +611,15 @@ void hb_stream_close( hb_stream_t ** _d ) * now have an audio codec, type, rate, etc., associated with them. At the end * of the scan we delete all the audio entries that weren't found by the scan * or don't have a format we support. This routine deletes audio entry 'indx' - * by copying all later entries down one slot. */ + * by setting its PID to an invalid value so no packet will match it. (We can't + * move any of the entries since the index of the entry is used as the id + * of the media stream for HB. */ static void hb_stream_delete_audio_entry(hb_stream_t *stream, int indx) { - int i; - - for (i = indx+1; i < stream->ts_number_audio_pids; ++i) + if ( stream->ts_audio_pids[indx] > 0 ) { - stream->ts_audio_pids[indx] = stream->ts_audio_pids[i]; - stream->ts_stream_type[1 + indx] = stream->ts_stream_type[1+i]; - stream->ts_extra_hdr[1 + indx] = stream->ts_extra_hdr[1+i]; - stream->ts_streamid[1 + indx] = stream->ts_streamid[1 + i]; - ++indx; + stream->ts_audio_pids[indx] = -stream->ts_audio_pids[indx]; } - --stream->ts_number_audio_pids; } static int index_of_pid(int pid, hb_stream_t *stream) @@ -658,20 +692,32 @@ hb_title_t * hb_stream_title_scan(hb_stream_t *stream) { free(audio); hb_stream_delete_audio_entry(stream, i); - --i; } } - // add the PCR PID if we don't already have it + // make sure we're grabbing the PCR PID if ( index_of_pid( stream->pmt_info.PCR_PID, stream ) < 0 ) { stream->ts_audio_pids[stream->ts_number_audio_pids++] = stream->pmt_info.PCR_PID; } - // set up the video codec to use for this title + // set the video id, codec & muxer + aTitle->video_id = 0; aTitle->video_codec = st2codec[stream->ts_stream_type[0]].codec; aTitle->video_codec_param = st2codec[stream->ts_stream_type[0]].codec_param; + aTitle->demuxer = HB_MPEG2_TS_DEMUXER; + + if ( ( stream->ts_flags & TS_HAS_PCR ) == 0 ) + { + hb_log( "transport stream missing PCRs - using video DTS instead" ); + } + + if ( stream->ts_IDRs < 1 ) + { + hb_log( "transport stream doesn't seem to have video IDR frames" ); + aTitle->flags |= HBTF_NO_IDR; + } } else { @@ -740,6 +786,89 @@ static void skip_to_next_pack( hb_stream_t *src_stream ) } } +static int isIframe( hb_stream_t *stream, const uint8_t *buf, int adapt_len ) +{ + // For mpeg2: look for a gop start or i-frame picture start + // for h.264: look for idr nal type or a slice header for an i-frame + // for vc1: look for a Sequence header + int i; + uint32_t strid = 0; + + + if ( stream->ts_stream_type[0] <= 2 ) + { + // This section of the code handles MPEG-1 and MPEG-2 video streams + for (i = 13 + adapt_len; i < 188; i++) + { + strid = (strid << 8) | buf[i]; + if ( ( strid >> 8 ) == 1 ) + { + // we found a start code + uint8_t id = strid; + switch ( id ) + { + case 0xB8: // group_start_code (GOP header) + case 0xB3: // sequence_header code + return 1; + + case 0x00: // picture_start_code + // picture_header, let's see if it's an I-frame + if (i<185) + { + // check if picture_coding_type == 1 + if ((buf[i+2] & (0x7 << 3)) == (1 << 3)) + { + // found an I-frame picture + return 1; + } + } + break; + } + } + } + // didn't find an I-frame + return 0; + } + if ( stream->ts_stream_type[0] == 0x1b ) + { + // we have an h.264 stream + for (i = 13 + adapt_len; i < 188; i++) + { + strid = (strid << 8) | buf[i]; + if ( ( strid >> 8 ) == 1 ) + { + // we found a start code - remove the ref_idc from the nal type + uint8_t nal_type = strid & 0x1f; + if ( nal_type == 0x05 ) + // h.264 IDR picture start + return 1; + } + } + // didn't find an I-frame + return 0; + } + if ( stream->ts_stream_type[0] == 0xea ) + { + // we have an vc1 stream + for (i = 13 + adapt_len; i < 188; i++) + { + strid = (strid << 8) | buf[i]; + if ( strid == 0x10f ) + { + // the ffmpeg vc1 decoder requires a seq hdr code in the first + // frame. + return 1; + } + } + // didn't find an I-frame + return 0; + } + + // we don't understand the stream type so just say "yes" otherwise + // we'll discard all the video. + return 1; +} + /* * scan the next MB of 'stream' to find the next start packet for * the Packetized Elementary Stream associated with TS PID 'pid'. @@ -757,12 +886,28 @@ static const uint8_t *hb_ts_stream_getPEStype(hb_stream_t *stream, uint32_t pid) return 0; } + // while we're reading the stream, check if it has valid PCRs + // and/or random access points. + uint32_t pack_pid = ( (buf[1] & 0x1f) << 8 ) | buf[2]; + if ( pack_pid == stream->pmt_info.PCR_PID ) + { + if ( ( buf[5] & 0x10 ) && + ( ( ( buf[3] & 0x30 ) == 0x20 ) || + ( ( buf[3] & 0x30 ) == 0x30 && buf[4] > 6 ) ) ) + { + stream->ts_flags |= TS_HAS_PCR; + } + } + if ( buf[5] & 0x40 ) + { + stream->ts_flags |= TS_HAS_RAP; + } + /* * The PES header is only in TS packets with 'start' set so we check * that first then check for the right PID. */ - if ((buf[1] & 0x40) == 0 || (buf[1] & 0x1f) != (pid >> 8) || - buf[2] != (pid & 0xff)) + if ((buf[1] & 0x40) == 0 || pack_pid != pid ) { // not a start packet or not the pid we want continue; @@ -864,7 +1009,7 @@ struct pts_pos { uint64_t pts; /* PTS from video stream */ }; -#define NDURSAMPLES 16 +#define NDURSAMPLES 128 // get one (position, timestamp) sampple from a transport or program // stream. @@ -893,6 +1038,14 @@ static struct pts_pos hb_sample_pts(hb_stream_t *stream, uint64_t fpos) ( ( (uint64_t)buf[11] >> 1 ) << 15 ) | ( (uint64_t)buf[12] << 7 ) | ( (uint64_t)buf[13] >> 1 ); + + if ( isIframe( stream, buf, -4 ) ) + { + if ( stream->ts_IDRs < 255 ) + { + ++stream->ts_IDRs; + } + } } else { @@ -921,7 +1074,7 @@ static int dur_compare( const void *a, const void *b ) static double compute_stream_rate( struct pts_pos *pp, int n ) { int i, j; - double rates[NDURSAMPLES * NDURSAMPLES / 2]; + double rates[NDURSAMPLES * NDURSAMPLES / 8]; double *rp = rates; // the following nested loops compute the rates between all pairs. @@ -936,11 +1089,13 @@ static double compute_stream_rate( struct pts_pos *pp, int n ) // could easily fall in the inter-piece part of the data which // would give a bogus estimate. The 'ns' index creates an // asymmetry that favors locality. - int ns = i + ( n >> 1 ); + int ns = i + ( n >> 3 ); if ( ns > n ) ns = n; for ( j = i+1; j < ns; ++j ) { + if ( (uint64_t)(pp[j].pts - pp[i].pts) > 90000LL*3600*6 ) + break; if ( pp[j].pts != pp[i].pts && pp[j].pos > pp[i].pos ) { *rp = ((double)( pp[j].pts - pp[i].pts )) / @@ -1044,7 +1199,76 @@ int hb_stream_read( hb_stream_t * src_stream, hb_buffer_t * b ) } return 1; } - return hb_ts_stream_decode( src_stream, b->data ); + return hb_ts_stream_decode( src_stream, b ); +} + +/*********************************************************************** + * hb_stream_seek_chapter + *********************************************************************** + * + **********************************************************************/ +int hb_stream_seek_chapter( hb_stream_t * stream, int chapter_num ) +{ + AVFormatContext *ic = stream->ffmpeg_ic; + uint64_t end_offset = 0; + uint64_t start_offset = 0; + uint64_t pos = 0; + hb_chapter_t *chapter = NULL; + int i; + + if( !stream || !stream->title ) + { + return 0; + } + if ( stream->hb_stream_type != ffmpeg ) + { + // currently meaningliess for transport and program streams + return 1; + } + + for( i = 0; i < chapter_num; i++) + { + chapter = hb_list_item( stream->title->list_chapter, + i ); + + if( chapter ) + { + /* + * Seeking to a chapter means that we are in that chapter, + * so track which chapter we are in so that we can output + * the correct chapter numbers in buf->new_chap + */ + start_offset = end_offset; + end_offset += chapter->duration; + stream->chapter = i; + stream->chapter_end = end_offset; + } else { + return 0; + } + } + + /* + * Is the the correct way to convert timebases? It seems to get it pretty + * much right - plus a few seconds, which is odd. + */ + pos = ((start_offset * AV_TIME_BASE) / 90000); + + hb_deep_log( 2, "Seeking to chapter %d time (starts: %lld ends %lld) AV pos %lld", chapter_num-1, start_offset, end_offset, pos); + + av_seek_frame( ic, -1, pos, 0); + + return 1; +} + +/*********************************************************************** + * hb_stream_chapter + *********************************************************************** + * Return the number of the chapter that we are currently in. We store + * the chapter number starting from 0, so + 1 for the real chpater num. + **********************************************************************/ +int hb_stream_chapter( hb_stream_t * src_stream ) +{ + return( src_stream->chapter + 1 ); } /*********************************************************************** @@ -1052,36 +1276,50 @@ int hb_stream_read( hb_stream_t * src_stream, hb_buffer_t * b ) *********************************************************************** * **********************************************************************/ -int hb_stream_seek( hb_stream_t * src_stream, float f ) +int hb_stream_seek( hb_stream_t * stream, float f ) { - if ( src_stream->hb_stream_type == ffmpeg ) + if ( stream->hb_stream_type == ffmpeg ) { - return ffmpeg_seek( src_stream, f ); + return ffmpeg_seek( stream, f ); } off_t stream_size, cur_pos, new_pos; double pos_ratio = f; - cur_pos = ftello( src_stream->file_handle ); - fseeko( src_stream->file_handle, 0, SEEK_END ); - stream_size = ftello( src_stream->file_handle ); + cur_pos = ftello( stream->file_handle ); + fseeko( stream->file_handle, 0, SEEK_END ); + stream_size = ftello( stream->file_handle ); new_pos = (off_t) ((double) (stream_size) * pos_ratio); new_pos &=~ (HB_DVD_READ_BUFFER_SIZE - 1); - int r = fseeko( src_stream->file_handle, new_pos, SEEK_SET ); + int r = fseeko( stream->file_handle, new_pos, SEEK_SET ); if (r == -1) { - fseeko( src_stream->file_handle, cur_pos, SEEK_SET ); + fseeko( stream->file_handle, cur_pos, SEEK_SET ); return 0; } - if ( src_stream->hb_stream_type == transport ) + if ( stream->hb_stream_type == transport ) { // We need to drop the current decoder output and move // forwards to the next transport stream packet. - hb_ts_stream_reset(src_stream); + hb_ts_stream_reset(stream); + if ( f > 0 ) + { + if ( stream->ts_IDRs ) + { + // the stream has IDRs so look for one. + stream->need_keyframe = 1; + } + } + else + { + // we're at the beginning - say we have video sync so that we + // won't drop initial SPS & PPS data on an AVC stream. + stream->need_keyframe = 0; + } } - else if ( src_stream->hb_stream_type == program ) + else if ( stream->hb_stream_type == program ) { - skip_to_next_pack( src_stream ); + skip_to_next_pack( stream ); } return 1; @@ -1162,15 +1400,12 @@ static hb_audio_t *hb_ts_stream_set_audio_id_and_codec(hb_stream_t *stream, uint8_t stype = 0; if (buf && buf[0] == 0x00 && buf[1] == 0x00 && buf[2] == 0x01) { - // 0xbd is the normal container for AC3/DCA/PCM/etc. 0xfd indicates an - // extended stream id (ISO 13818-1(2007)). If we cared about the - // real id we'd have to look inside the PES extension to find it. - // But since we remap stream id's when we generate PS packets from - // the TS packets we can just ignore the actual id. - if ( buf[3] == 0xbd || buf[3] == 0xfd ) + stype = stream->ts_stream_type[1 + aud_pid_index]; + + // 0xbd ("private stream 1") is the normal container for non-ISO + // media - AC3/DCA/PCM/etc. + if ( buf[3] == 0xbd ) { - audio->id = 0x80bd | (aud_pid_index << 8); - stype = stream->ts_stream_type[1 + aud_pid_index]; if ( st2codec[stype].kind == U ) { // XXX assume unknown stream types are AC-3 (if they're not @@ -1179,12 +1414,38 @@ static hb_audio_t *hb_ts_stream_set_audio_id_and_codec(hb_stream_t *stream, stype = 0x81; stream->ts_stream_type[1 + aud_pid_index] = 0x81; } - stream->ts_streamid[1 + aud_pid_index] = 0xbd; + } + else if ( buf[3] == 0xfd ) + { + // 0xfd indicates an extended stream id (ISO 13818-1(2007)). + // the blu ray consortium apparently forgot to read the portion + // of the MPEG spec that says one PID should map to one media + // stream and multiplexed multiple types of audio into one PID + // using the extended stream identifier of the PES header to + // distinguish them. So we have to check if that's happening and + // if so tell the runtime what esid we want. + if ( st2codec[stype].kind == A && stype == 0x83 && + stream->ts_format_id[1 + aud_pid_index] == TS_FORMAT_ID_AC3 ) + { + // This is an interleaved TrueHD/AC-3 stream and the esid of + // the AC-3 is 0x76 + stream->ts_multiplexed[1 + aud_pid_index] = 0x76; + stype = 0x81; + stream->ts_stream_type[1 + aud_pid_index] = 0x81; + } + if ( st2codec[stype].kind == A && stype == 0x86 ) + { + // This is an interleaved DTS-HD/DTS stream and the esid of + // the DTS is 0x71 + stream->ts_multiplexed[1 + aud_pid_index] = 0x71; + stype = 0x82; + stream->ts_stream_type[1 + aud_pid_index] = 0x82; + } } else if ((buf[3] & 0xe0) == 0xc0) { - audio->id = 0xc0 | aud_pid_index; - stype = stream->ts_stream_type[1 + aud_pid_index]; + // 0xC0 - 0xCF are the normal containers for ISO-standard + // media (mpeg2 audio and mpeg4 AAC). if ( st2codec[stype].kind == U ) { // XXX assume unknown stream types are MPEG audio @@ -1192,18 +1453,21 @@ static hb_audio_t *hb_ts_stream_set_audio_id_and_codec(hb_stream_t *stream, stream->ts_stream_type[1 + aud_pid_index] = 0x03; } } + else + { + stype = 0; + } } // if we found an audio stream type & HB has a codec that can decode it // finish configuring the audio so we'll add it to the title's list. if ( st2codec[stype].kind == A && st2codec[stype].codec ) { - stream->ts_streamid[1 + aud_pid_index] = audio->id; - stream->ts_extra_hdr[1 + aud_pid_index] = st2codec[stype].extra_hdr; + audio->id = 1 + aud_pid_index; audio->config.in.codec = st2codec[stype].codec; audio->config.in.codec_param = st2codec[stype].codec_param; set_audio_description( audio, lang_for_code( stream->a52_info[aud_pid_index].lang_code ) ); - hb_log("transport stream pid 0x%x (type 0x%x) is %s audio id 0x%x", + hb_log("transport stream pid 0x%x (type 0x%x) may be %s audio (id 0x%x)", stream->ts_audio_pids[aud_pid_index], stype, st2codec[stype].name, audio->id); } @@ -1335,10 +1599,9 @@ static void hb_ts_stream_init(hb_stream_t *stream) for (i = 0; i < stream->ts_number_video_pids + stream->ts_number_audio_pids; i++) { // demuxing buffer for TS to PS conversion - stream->ts_buf[i] = malloc( HB_DVD_READ_BUFFER_SIZE ); + stream->ts_buf[i] = hb_buffer_init(stream->packetsize); + stream->ts_buf[i]->size = 0; } - - stream->ts_streamid[0] = 0xE0; // stream 0 must be video } #define MAX_HOLE 208*80 @@ -1448,6 +1711,11 @@ static void decode_element_descriptors(hb_stream_t* stream, int esindx, { switch (dp[0]) { + case 5: // Registration descriptor + stream->ts_format_id[esindx] = (dp[2] << 24) | (dp[3] << 16) | + (dp[4] << 8) | dp[5]; + break; + case 10: // ISO_639_language descriptor stream->a52_info[esindx].lang_code = lang_to_code(lang_for_code2((const char *)&dp[2])); break; @@ -1789,14 +2057,6 @@ static void hb_ts_stream_find_pids(hb_stream_t *stream) if ((stream->ts_number_video_pids > 0) && (stream->ts_number_audio_pids > 0)) break; } - // XXX - until we figure out how to handle VC1 just bail when we find it so - // that ffmpeg will claim the input stream. - if ( stream->ts_stream_type[0] == 0xea ) - { - stream->ts_number_video_pids = 0; - stream->ts_number_audio_pids = 0; - return; - } hb_log("hb_ts_stream_find_pids - found the following PIDS"); hb_log(" Video PIDS : "); @@ -1819,280 +2079,102 @@ static void hb_ts_stream_find_pids(hb_stream_t *stream) } -static void fwrite64( hb_stream_t *stream, void *buf, int size ) +static void fwrite64( hb_stream_t *stream, void *buf, int len ) { - if ( (stream->fwrite_buf - stream->fwrite_buf_orig) + size > 2048 ) + if ( len > 0 ) { - hb_log( "steam fwrite64 buffer overflow - writing %d with %d already", - size, stream->fwrite_buf - stream->fwrite_buf_orig ); - return; + int pos = stream->fwrite_buf->size; + if ( pos + len > stream->fwrite_buf->alloc ) + { + int size = MAX(stream->fwrite_buf->alloc * 2, pos + len); + hb_buffer_realloc(stream->fwrite_buf, size); + } + memcpy( &(stream->fwrite_buf->data[pos]), buf, len ); + stream->fwrite_buf->size += len; } - memcpy( stream->fwrite_buf, buf, size ); - stream->fwrite_buf += size; } -static void write_pack(hb_stream_t* stream, uint64_t time, int stuffing) +// convert a PES PTS or DTS to an int64 +static int64_t pes_timestamp( const uint8_t *pes ) { - uint8_t buf[24]; - - buf[0] = 0x00; // pack id - buf[1] = 0x00; - buf[2] = 0x01; - buf[3] = 0xba; - - buf[4] = 0x44 | // SCR - ( ( ( time >> 30 ) & 7 ) << 3 ) | - ( ( time >> 28 ) & 3 ); - buf[5] = time >> 20; - buf[6] = 0x04 | - ( ( ( time >> 15 ) & 0x1f ) << 3 ) | - ( ( time >> 13 ) & 3 ); - buf[7] = time >> 5; - buf[8] = 0x04 | ( time << 3 ); - - buf[9] = 0x01; // SCR extension - - buf[10] = 384000 >> (22 - 8); // program mux rate - buf[11] = (uint8_t)( 384000 >> (22 - 16) ); - buf[12] = (uint8_t)( 384000 << 2 ) | 0x03; - - buf[13] = 0xf8 | stuffing; - - int i; - for (i = 0; i < stuffing; ++i ) - buf[14+i] = 0xff; - - fwrite64(stream, buf, 14 + stuffing ); -} - -static void pad_buffer(hb_stream_t* stream, int pad) -{ - pad -= 6; - - uint8_t buf[6]; - buf[0] = 0; - buf[1] = 0; - buf[2] = 0; - buf[3] = 0xbe; - buf[4] = pad >> 8; - buf[5] = pad; - - fwrite64(stream, buf, 6); - - buf[0] = 0xff; - while ( --pad >= 0 ) - { - fwrite64(stream, buf, 1); - } -} - -static void make_pes_header(hb_stream_t* stream, int len, uint8_t streamid) -{ - uint8_t buf[9]; - - memset(buf, 0, sizeof(buf) ); - buf[2] = 1; - buf[3] = streamid; - buf[4] = ( len + 3 ) >> 8; - buf[5] = len + 3; - buf[6] = 0x88; - - fwrite64(stream, buf, 9); + int64_t ts = ( (uint64_t)(pes[0] & 0xe ) << 29 ); + ts |= ( pes[1] << 22 ) | ( ( pes[2] >> 1 ) << 15 ) | + ( pes[3] << 7 ) | ( pes[4] >> 1 ); + return ts; } static void generate_output_data(hb_stream_t *stream, int curstream) { - uint8_t *tdat = stream->ts_buf[curstream]; - int len; - - // we always ship a PACK header plus all the data in our demux buf. - // AC3 audio also always needs its substream header. - len = 14 + stream->ts_pos[curstream]; - if ( stream->ts_extra_hdr[curstream] ) - { - len += 4; - } + hb_buffer_t *buf = stream->fwrite_buf; + uint8_t *tdat = stream->ts_buf[curstream]->data; - if ( ! stream->ts_start[curstream] ) - { - // we're in the middle of a chunk of PES data - we need to add - // a 'continuation' PES header after the PACK header. - len += 9; - } + buf->id = curstream; - // Write out pack header - // If we don't have 2048 bytes we need to pad to 2048. We can - // add a padding frame after our data but we need at least 7 - // bytes of space to do it (6 bytes of header & 1 of pad). If - // we have fewer than 7 bytes left we need to fill the excess - // space with stuffing bytes added to the pack header. - int stuffing = 0; - if ( len > HB_DVD_READ_BUFFER_SIZE ) + // check if this packet was referenced to an older pcr and if that + // pcr was significantly different than the one we're using now. + // (the reason for the uint cast on the pcr difference is that the + // difference is significant if it advanced by more than 200ms or if + // it went backwards by any amount. The negative numbers look like huge + // unsigned ints so the cast allows both conditions to be checked at once. + int bufpcr = stream->ts_buf[curstream]->cur; + int curpcr = stream->ts_pcr_out; + if ( bufpcr && bufpcr < curpcr && + (uint64_t)(stream->ts_pcrhist[curpcr & 3] - stream->ts_pcrhist[bufpcr & 3]) > 200*90LL ) { - hb_log( "stream ts length botch %d", len ); + // we've sent up a new pcr but have a packet referenced to an + // old pcr and the difference was enough to trigger a discontinuity + // correction. smash the timestamps or we'll mess up the correction. + buf->start = -1; + buf->renderOffset = -1; } - if ( HB_DVD_READ_BUFFER_SIZE - len < 8) - { - stuffing = HB_DVD_READ_BUFFER_SIZE - len; - } - write_pack(stream, stream->ts_nextpcr, stuffing ); - stream->ts_nextpcr += 10; - - if ( stream->ts_start[curstream] ) + else { - // Start frames already have a PES header but we have modify it - // to map from TS PID to PS stream id. Also, if the stream is AC3 - // audio we have to insert an AC3 stream header between the end of - // the PES header and the start of the stream data. - - stream->ts_start[curstream] = 0; - tdat[3] = stream->ts_streamid[curstream]; - - uint16_t plen = stream->ts_pos[curstream] - 6; - if ( stream->ts_extra_hdr[curstream] ) + if ( stream->ts_pcr_out != stream->ts_pcr_in ) { - // We have to add an AC3 header in front of the data. Add its - // size to the PES packet length. - plen += 4; - tdat[4] = plen >> 8; - tdat[5] = plen; - - // Write out the PES header - int hdrsize = 9 + tdat[8]; - fwrite64(stream, tdat, hdrsize); - - // add a four byte DVD ac3 stream header - uint8_t ac3_substream_id[4]; - int ssid = (curstream - stream->ts_number_video_pids) & 0xf; - ac3_substream_id[0] = 0x80 | ssid; // substream id - ac3_substream_id[1] = 0x01; // number of sync words - ac3_substream_id[2] = 0x00; // first offset (16 bits) - ac3_substream_id[3] = 0x02; - fwrite64(stream, ac3_substream_id, 4); - - // add the rest of the data - fwrite64(stream, tdat + hdrsize, stream->ts_pos[curstream] - hdrsize); + // we have a new pcr + stream->ts_pcr_out = stream->ts_pcr_in; + buf->stop = stream->ts_pcr; + stream->ts_pcrhist[stream->ts_pcr_out & 3] = stream->ts_pcr; } else { - // not audio - don't need to modify the stream so write what we've got - tdat[4] = plen >> 8; - tdat[5] = plen; - fwrite64( stream, tdat, stream->ts_pos[curstream] ); + buf->stop = -1; } - } - else - { - // data without a PES start header needs a simple 'continuation' - // PES header. AC3 audio also needs its substream header. - if ( stream->ts_extra_hdr[curstream] == 0 ) + + // put the PTS & possible DTS into 'start' & 'renderOffset' then strip + // off the PES header. + if ( tdat[7] & 0xc0 ) { - make_pes_header(stream, stream->ts_pos[curstream], - stream->ts_streamid[curstream]); + buf->start = pes_timestamp( tdat + 9 ); + buf->renderOffset = ( tdat[7] & 0x40 )? pes_timestamp( tdat + 14 ) : + buf->start; } else { - make_pes_header(stream, stream->ts_pos[curstream] + 4, - stream->ts_streamid[curstream]); - - // add a four byte DVD ac3 stream header - uint8_t ac3_substream_id[4]; - int ssid = (curstream - stream->ts_number_video_pids) & 0xf; - ac3_substream_id[0] = 0x80 | ssid; // substream id - ac3_substream_id[1] = 0x01; // number of sync words - ac3_substream_id[2] = 0x00; // first offset (16 bits) - ac3_substream_id[3] = 0x02; - fwrite64(stream, ac3_substream_id, 4); + buf->start = -1; + buf->renderOffset = -1; } - fwrite64( stream, tdat, stream->ts_pos[curstream] ); } + int hlen = tdat[8] + 9; - // Write padding - int left = HB_DVD_READ_BUFFER_SIZE - len; - if ( left >= 8 ) - { - pad_buffer(stream, left); - } + fwrite64( stream, tdat + hlen, stream->ts_pos[curstream] - hlen ); stream->ts_pos[curstream] = 0; + stream->ts_buf[curstream]->size = 0; } -static int isIframe( hb_stream_t *stream, const uint8_t *buf, int adapt_len ) +static void hb_ts_stream_append_pkt(hb_stream_t *stream, int idx, const uint8_t *buf, int len) { - // For mpeg2: look for a gop start or i-frame picture start - // for h.264: look for idr nal type or a slice header for an i-frame - // for vc1: ??? - int i; - uint32_t strid = 0; - - - if ( stream->ts_stream_type[0] <= 2 ) + if (stream->ts_pos[idx] + len > stream->ts_buf[idx]->alloc) { - // This section of the code handles MPEG-1 and MPEG-2 video streams - for (i = 13 + adapt_len; i < 188; i++) - { - strid = (strid << 8) | buf[i]; - if ( ( strid >> 8 ) == 1 ) - { - // we found a start code - uint8_t id = strid; - switch ( id ) - { - case 0xB8: // group_start_code (GOP header) - case 0xB3: // sequence_header code - return 1; - - case 0x00: // picture_start_code - // picture_header, let's see if it's an I-frame - if (i<185) - { - // check if picture_coding_type == 1 - if ((buf[i+2] & (0x7 << 3)) == (1 << 3)) - { - // found an I-frame picture - return 1; - } - } - break; - } - } - } - // didn't find an I-frame - return 0; - } - if ( stream->ts_stream_type[0] == 0x1b ) - { - // we have an h.264 stream - for (i = 13 + adapt_len; i < 188; i++) - { - strid = (strid << 8) | buf[i]; - if ( ( strid >> 8 ) == 1 ) - { - // we found a start code - remove the ref_idc from the nal type - uint8_t nal_type = strid & 0x1f; - if ( nal_type == 0x05 ) - // h.264 IDR picture start - return 1; + int size; - if ( nal_type == 0x01 ) - { - // h.264 slice: has to be start MB 0 & type I (2, 4, 7 or 9) - uint8_t id = buf[i+1]; - if ( ( id >> 4 ) == 0x0b || ( id >> 2 ) == 0x25 || - id == 0x88 || id == 0x8a ) - { - return 1; - } - } - } - } - // didn't find an I-frame - return 0; + size = MAX(stream->ts_buf[idx]->alloc * 2, stream->ts_pos[idx] + len); + hb_buffer_realloc(stream->ts_buf[idx], size); } - - // we don't understand the stream type so just say "yes" otherwise - // we'll discard all the video. - return 1; + memcpy(stream->ts_buf[idx]->data + stream->ts_pos[idx], buf, len); + stream->ts_pos[idx] += len; + stream->ts_buf[idx]->size += len; } /*********************************************************************** @@ -2100,19 +2182,18 @@ static int isIframe( hb_stream_t *stream, const uint8_t *buf, int adapt_len ) *********************************************************************** * **********************************************************************/ -static int hb_ts_stream_decode( hb_stream_t *stream, uint8_t *obuf ) +static int hb_ts_stream_decode( hb_stream_t *stream, hb_buffer_t *obuf ) { /* * stash the output buffer pointer in our stream so we don't have to * pass it & its original value to everything we call. */ + obuf->size = 0; stream->fwrite_buf = obuf; - stream->fwrite_buf_orig = obuf; // spin until we get a packet of data from some stream or hit eof while ( 1 ) { - int64_t pcr = stream->ts_lastpcr; int curstream; const uint8_t *buf = next_packet(stream); @@ -2159,26 +2240,36 @@ static int hb_ts_stream_decode( hb_stream_t *stream, uint8_t *obuf ) } } - // if there's an adaptation header & PCR_flag is set - // get the PCR (Program Clock Reference) - if ( adapt_len > 7 && ( buf[5] & 0x10 ) != 0 ) + if ( adapt_len > 0 ) { - pcr = ( (uint64_t)buf[6] << (33 - 8) ) | - ( (uint64_t)buf[7] << (33 - 16) ) | - ( (uint64_t)buf[8] << (33 - 24) ) | - ( (uint64_t)buf[9] << (33 - 32) ) | - ( buf[10] >> 7 ); - stream->ts_nextpcr = pcr; - - // remember the pcr across calls to this routine - stream->ts_lastpcr = pcr; + if ( buf[5] & 0x40 ) + { + // found a random access point + } + // if there's an adaptation header & PCR_flag is set + // get the PCR (Program Clock Reference) + if ( adapt_len > 7 && ( buf[5] & 0x10 ) != 0 ) + { + stream->ts_pcr = ( (uint64_t)buf[6] << (33 - 8) ) | + ( (uint64_t)buf[7] << (33 - 16) ) | + ( (uint64_t)buf[8] << (33 - 24) ) | + ( (uint64_t)buf[9] << (33 - 32) ) | + ( buf[10] >> 7 ); + ++stream->ts_pcr_in; + stream->ts_found_pcr = 1; + } } - // If we don't have a pcr yet, the right thing to do here would - // be a 'continue' so we don't process anything until we have a - // clock reference. Unfortunately the HD Home Run appears to null - // out the pcr field of some streams so we keep going & substitute - // the video stream dts for the pcr when there's no pcr. + // If we don't have a PCR yet but the stream has PCRs just loop + // so we don't process anything until we have a clock reference. + // Unfortunately the HD Home Run appears to null out the PCR so if + // we didn't detect a PCR during scan keep going and we'll use + // the video stream DTS for the PCR. + + if ( !stream->ts_found_pcr && ( stream->ts_flags & TS_HAS_PCR ) ) + { + continue; + } // Get continuity // Continuity only increments for adaption values of 0x3 or 0x01 @@ -2198,7 +2289,7 @@ static int hb_ts_stream_decode( hb_stream_t *stream, uint8_t *obuf ) continue; } if ( !start && (stream->ts_streamcont[curstream] != -1) && - stream->ts_foundfirst[curstream] && + !stream->ts_skipbad[curstream] && (continuity != ( (stream->ts_streamcont[curstream] + 1) & 0xf ) ) ) { ts_err( stream, curstream, "continuity error: got %d expected %d", @@ -2216,35 +2307,34 @@ static int hb_ts_stream_decode( hb_stream_t *stream, uint8_t *obuf ) { // Found a random access point (now we can start a frame/audio packet..) + if ( stream->need_keyframe ) + { + // we're looking for the first video frame because we're + // doing random access during 'scan' + if ( curstream != 0 || !isIframe( stream, buf, adapt_len ) ) + { + // not the video stream or didn't find an I frame + // but we'll only wait 255 video frames for an I frame. + if ( curstream != 0 || ++stream->need_keyframe ) + { + continue; + } + } + stream->need_keyframe = 0; + } + // If we were skipping a bad packet, start fresh on this new PES packet.. if (stream->ts_skipbad[curstream] == 1) { - // video skips to an iframe after a bad packet to minimize - // screen corruption - if ( curstream == 0 && !isIframe( stream, buf, adapt_len ) ) - { - continue; - } stream->ts_skipbad[curstream] = 0; } - // If we don't have video yet, check to see if this is an - // i_frame (group of picture start) if ( curstream == 0 ) { - if ( !stream->ts_foundfirst[0] ) - { - if ( !isIframe( stream, buf, adapt_len ) ) - { - // didn't find an I frame - continue; - } - stream->ts_foundfirst[0] = 1; - } ++stream->frames; // if we don't have a pcr yet use the dts from this frame - if ( pcr == -1 ) + if ( !stream->ts_found_pcr ) { // PES must begin with an mpeg start code & contain // a DTS or PTS. @@ -2255,55 +2345,65 @@ static int hb_ts_stream_decode( hb_stream_t *stream, uint8_t *obuf ) continue; } // if we have a dts use it otherwise use the pts - pes += (pes[7] & 0x40)? 14 : 9; - - pcr = ( (uint64_t)(pes[0] & 0xe ) << 29 ); - pcr |= ( pes[1] << 22 ) | - ( ( pes[2] >> 1 ) << 15 ) | - ( pes[3] << 7 ) | - ( pes[4] >> 1 ); - stream->ts_nextpcr = pcr; + stream->ts_pcr = pes_timestamp( pes + ( pes[7] & 0x40? 14 : 9 ) ); + ++stream->ts_pcr_in; } } - else if ( ! stream->ts_foundfirst[curstream] ) + + // if this is a multiplexed stream make sure this is the + // substream we want. + if ( stream->ts_multiplexed[curstream] ) { - // start other streams only after first video frame found. - if ( ! stream->ts_foundfirst[0] ) + // PES must begin with an mpeg start code & contain + // a DTS or PTS. + const uint8_t *pes = buf + adapt_len + 4; + if ( pes[0] != 0x00 || pes[1] != 0x00 || pes[2] != 0x01 || + pes[3] != 0xfd ) { + stream->ts_skipbad[curstream] = 1; continue; } - stream->ts_foundfirst[curstream] = 1; - } + // the last byte of the header is the extension id. see if + // it's the one we want. + if ( pes[pes[8]+8] != stream->ts_multiplexed[curstream] ) + { + stream->ts_skipbad[curstream] = 1; + continue; + } + } // If we have some data already on this stream, turn it into // a program stream packet. Then add the payload for this // packet to the current pid's buffer. if ( stream->ts_pos[curstream] ) { + // we have to ship the old packet before updating the pcr + // since the packet we've been accumulating is referenced + // to the old pcr. generate_output_data(stream, curstream); - stream->ts_start[curstream] = 1; - memcpy(stream->ts_buf[curstream], - buf + 4 + adapt_len, 184 - adapt_len); - stream->ts_pos[curstream] = 184 - adapt_len; + + // remember the pcr that was in effect when we started + // this packet. + stream->ts_buf[curstream]->cur = stream->ts_pcr_in; + hb_ts_stream_append_pkt(stream, curstream, buf + 4 + adapt_len, + 184 - adapt_len); return 1; } - stream->ts_start[curstream] = 1; + // remember the pcr that was in effect when we started this packet. + stream->ts_buf[curstream]->cur = stream->ts_pcr_in; } // Add the payload for this packet to the current buffer - if (!stream->ts_skipbad[curstream] && stream->ts_foundfirst[curstream] && - (184 - adapt_len) > 0) + if (!stream->ts_skipbad[curstream] && (184 - adapt_len) > 0) { - memcpy(stream->ts_buf[curstream] + stream->ts_pos[curstream], - buf + 4 + adapt_len, 184 - adapt_len); - stream->ts_pos[curstream] += 184 - adapt_len; - - // if the next TS packet could possibly overflow our 2K output buffer - // we need to generate a packet now. Overflow would be 184 bytes of - // data + the 9 byte PES hdr + the 14 byte PACK hdr = 211 bytes. - if ( stream->ts_pos[curstream] >= (HB_DVD_READ_BUFFER_SIZE - 216) ) + hb_ts_stream_append_pkt(stream, curstream, buf + 4 + adapt_len, + 184 - adapt_len); + // see if we've hit the end of this PES packet + const uint8_t *pes = stream->ts_buf[curstream]->data; + int len = ( pes[4] << 8 ) + pes[5] + 6; + if ( len > 6 && stream->ts_pos[curstream] == len && + pes[0] == 0x00 && pes[1] == 0x00 && pes[2] == 0x01 ) { - // we have enough data to make a PS packet generate_output_data(stream, curstream); return 1; } @@ -2318,14 +2418,16 @@ static void hb_ts_stream_reset(hb_stream_t *stream) for (i=0; i < kMaxNumberDecodeStreams; i++) { stream->ts_pos[i] = 0; - stream->ts_foundfirst[i] = 0; - stream->ts_skipbad[i] = 0; + stream->ts_skipbad[i] = 1; stream->ts_streamcont[i] = -1; - stream->ts_start[i] = 0; } - stream->ts_lastpcr = -1; - stream->ts_nextpcr = -1; + stream->need_keyframe = 0; + + stream->ts_found_pcr = 0; + stream->ts_pcr_out = 0; + stream->ts_pcr_in = 0; + stream->ts_pcr = 0; stream->frames = 0; stream->errors = 0; @@ -2347,7 +2449,7 @@ static void ffmpeg_add_codec( hb_stream_t *stream, int stream_index ) context->error_recognition = 1; context->error_concealment = FF_EC_GUESS_MVS|FF_EC_DEBLOCK; AVCodec *codec = avcodec_find_decoder( context->codec_id ); - avcodec_open( context, codec ); + hb_avcodec_open( context, codec ); } // The ffmpeg stream reader / parser shares a lot of state with the @@ -2469,7 +2571,6 @@ static int ffmpeg_open( hb_stream_t *stream, hb_title_t *title ) // indexed its stream so we need to remap them so they point // to this stream. ffmpeg_remap_stream( stream, title ); - ffmpeg_seek( stream, 0. ); av_log_set_level( AV_LOG_ERROR ); } else @@ -2589,16 +2690,6 @@ static hb_title_t *ffmpeg_title_scan( hb_stream_t *stream ) title->minutes = ( dur % 3600 ) / 60; title->seconds = dur % 60; - // One Chapter - hb_chapter_t * chapter; - chapter = calloc( sizeof( hb_chapter_t ), 1 ); - chapter->index = 1; - chapter->duration = title->duration; - chapter->hours = title->hours; - chapter->minutes = title->minutes; - chapter->seconds = title->seconds; - hb_list_add( title->list_chapter, chapter ); - // set the title to decode the first video stream in the file title->demuxer = HB_NULL_DEMUXER; title->video_codec = 0; @@ -2610,6 +2701,7 @@ static hb_title_t *ffmpeg_title_scan( hb_stream_t *stream ) title->video_codec == 0 ) { title->video_id = i; + stream->ffmpeg_video_id = i; // We have to use the 'internal' avcodec decoder because // it needs to share the codec context from this video @@ -2628,6 +2720,50 @@ static hb_title_t *ffmpeg_title_scan( hb_stream_t *stream ) title->container_name = strdup( ic->iformat->name ); title->data_rate = ic->bit_rate; + hb_deep_log( 2, "Found ffmpeg %d chapters, container=%s", ic->nb_chapters, ic->iformat->name ); + + if( ic->nb_chapters != 0 ) + { + AVChapter *m; + uint64_t duration_sum = 0; + for( i = 0; i < ic->nb_chapters; i++ ) + if( m = ic->chapters[i] ) + { + hb_chapter_t * chapter; + chapter = calloc( sizeof( hb_chapter_t ), 1 ); + chapter->index = i+1; + chapter->duration = ( m->end / ( (double) m->time_base.num * m->time_base.den ) ) * 90000 - duration_sum; + duration_sum += chapter->duration; + chapter->hours = chapter->duration / 90000 / 3600; + chapter->minutes = ( ( chapter->duration / 90000 ) % 3600 ) / 60; + chapter->seconds = ( chapter->duration / 90000 ) % 60; + strcpy( chapter->title, m->title ); + hb_deep_log( 2, "Added chapter %i, name='%s', dur=%llu, (%02i:%02i:%02i)", + chapter->index, chapter->title, + chapter->duration, chapter->hours, + chapter->minutes, chapter->seconds ); + hb_list_add( title->list_chapter, chapter ); + } + } + + /* + * Fill the metadata. + */ + decmetadata( title ); + + if( hb_list_count( title->list_chapter ) == 0 ) + { + // Need at least one chapter + hb_chapter_t * chapter; + chapter = calloc( sizeof( hb_chapter_t ), 1 ); + chapter->index = 1; + chapter->duration = title->duration; + chapter->hours = title->hours; + chapter->minutes = title->minutes; + chapter->seconds = title->seconds; + hb_list_add( title->list_chapter, chapter ); + } + return title; } @@ -2638,9 +2774,56 @@ static int64_t av_to_hb_pts( int64_t pts, double conv_factor ) return (int64_t)( (double)pts * conv_factor ); } +static int ffmpeg_is_keyframe( hb_stream_t *stream ) +{ + uint8_t *pkt; + + switch ( stream->ffmpeg_ic->streams[stream->ffmpeg_video_id]->codec->codec_id ) + { + case CODEC_ID_VC1: + // XXX the VC1 codec doesn't mark key frames so to get previews + // we do it ourselves here. The decoder gets messed up if it + // doesn't get a SEQ header first so we consider that to be a key frame. + pkt = stream->ffmpeg_pkt->data; + if ( pkt[0] && pkt[1] && pkt[2] == 1 && pkt[3] == 0x0f ) + return 1; + + return 0; + + case CODEC_ID_WMV3: + // XXX the ffmpeg WMV3 codec doesn't mark key frames. + // Only M$ could make I-frame detection this complicated: there + // are two to four bits of unused junk ahead of the frame type + // so we have to look at the sequence header to find out how much + // to skip. Then there are three different ways of coding the type + // depending on whether it's main or advanced profile then whether + // there are bframes or not so we have to look at the sequence + // header to get that. + pkt = stream->ffmpeg_pkt->data; + uint8_t *seqhdr = stream->ffmpeg_ic->streams[stream->ffmpeg_video_id]->codec->extradata; + int pshift = 2; + if ( ( seqhdr[3] & 0x02 ) == 0 ) + // no FINTERPFLAG + ++pshift; + if ( ( seqhdr[3] & 0x80 ) == 0 ) + // no RANGEREDUCTION + ++pshift; + if ( seqhdr[3] & 0x70 ) + // stream has b-frames + return ( ( pkt[0] >> pshift ) & 0x3 ) == 0x01; + + return ( ( pkt[0] >> pshift ) & 0x2 ) == 0; + + default: + break; + } + return ( stream->ffmpeg_pkt->flags & PKT_FLAG_KEY ); +} + static int ffmpeg_read( hb_stream_t *stream, hb_buffer_t *buf ) { int err; + again: if ( ( err = av_read_frame( stream->ffmpeg_ic, stream->ffmpeg_pkt )) < 0 ) { // XXX the following conditional is to handle avi files that @@ -2667,6 +2850,13 @@ static int ffmpeg_read( hb_stream_t *stream, hb_buffer_t *buf ) { if ( stream->ffmpeg_pkt->size > buf->alloc ) { + // sometimes we get absurd sizes from ffmpeg + if ( stream->ffmpeg_pkt->size >= (1 << 25) ) + { + hb_log( "ffmpeg_read: pkt too big: %d bytes", stream->ffmpeg_pkt->size ); + av_free_packet( stream->ffmpeg_pkt ); + return ffmpeg_read( stream, buf ); + } // need to expand buffer hb_buffer_realloc( buf, stream->ffmpeg_pkt->size ); } @@ -2674,6 +2864,23 @@ static int ffmpeg_read( hb_stream_t *stream, hb_buffer_t *buf ) buf->size = stream->ffmpeg_pkt->size; } buf->id = stream->ffmpeg_pkt->stream_index; + if ( buf->id == stream->ffmpeg_video_id ) + { + if ( stream->need_keyframe ) + { + // we've just done a seek (generally for scan or live preview) and + // want to start at a keyframe. Some ffmpeg codecs seek to a key + // frame but most don't. So we spin until we either get a keyframe + // or we've looked through 50 video frames without finding one. + if ( ! ffmpeg_is_keyframe( stream ) && ++stream->need_keyframe < 50 ) + { + av_free_packet( stream->ffmpeg_pkt ); + goto again; + } + stream->need_keyframe = 0; + } + ++stream->frames; + } // if we haven't done it already, compute a conversion factor to go // from the ffmpeg timebase for the stream to HB's 90KHz timebase. @@ -2691,6 +2898,55 @@ static int ffmpeg_read( hb_stream_t *stream, hb_buffer_t *buf ) { buf->start = buf->renderOffset; } + + /* + * Check to see whether this video buffer is on a chapter + * boundary, if so mark it as such in the buffer. The chapters for + * a stream have a simple duration for each chapter. So we keep + * track of what chapter we are in currently, and when it is due + * to end. + */ + hb_deep_log( 3, "title=0x%x, job=0x%x, chapter_markers=%d, time=%lld, chapter=%d, end_chapter=%lld", + stream->title, + stream->title ? (stream->title->job ? stream->title->job : 0x0) : 0x0, + stream->title ? (stream->title->job ? stream->title->job->chapter_markers : 2) : 0x0, + buf->start, stream->chapter, stream->chapter_end); + + if( stream->title && + stream->title->job && + stream->title->job->chapter_markers && + buf->id == stream->ffmpeg_video_id && + buf->start >= stream->chapter_end ) + { + hb_chapter_t *chapter = NULL; + + /* + * Store when this chapter ends using HB time. + */ + chapter = hb_list_item( stream->title->list_chapter, + stream->chapter ); + + if( chapter ) + { + buf->new_chap = stream->chapter + 2; + + hb_deep_log( 2, "Starting chapter %i at %lld", buf->new_chap, buf->start); + hb_chapter_t *nextChapter = NULL; + nextChapter = hb_list_item( stream->title->list_chapter, + stream->chapter + 1 ); + if( nextChapter ) + stream->chapter_end += nextChapter->duration; + stream->chapter++; + hb_deep_log( 2, "Looking for chapter %i at %lld", stream->chapter + 2, stream->chapter_end ); + } else { + /* + * Must have run out of chapters, stop looking. + */ + stream->chapter_end = -1; + } + } else { + buf->new_chap = 0; + } av_free_packet( stream->ffmpeg_pkt ); return 1; } @@ -2698,7 +2954,19 @@ static int ffmpeg_read( hb_stream_t *stream, hb_buffer_t *buf ) static int ffmpeg_seek( hb_stream_t *stream, float frac ) { AVFormatContext *ic = stream->ffmpeg_ic; - int64_t pos = (double)ic->duration * (double)frac; - av_seek_frame( ic, -1, pos, pos? 0 : AVSEEK_FLAG_BACKWARD ); + if ( frac > 0. ) + { + int64_t pos = (double)ic->duration * (double)frac; + if ( ic->start_time != AV_NOPTS_VALUE ) + { + pos += ic->start_time; + } + av_seek_frame( ic, -1, pos, 0 ); + stream->need_keyframe = 1; + } + else + { + av_seek_frame( ic, -1, 0LL, AVSEEK_FLAG_BACKWARD ); + } return 1; }