Index: programs/mythtranscode/mpeg2trans.cpp =================================================================== --- programs/mythtranscode/mpeg2trans.cpp (revision 6963) +++ programs/mythtranscode/mpeg2trans.cpp (working copy) @@ -1,1016 +1,557 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include #include +#include + using namespace std; +#include "avformat.h" +#include "avcodec.h" + +#include "mythcontext.h" +#include "programinfo.h" +#include "exitcodes.h" +#include "jobqueue.h" + #include "mpeg2trans.h" -class GetBits -{ - public: - GetBits(uint8_t *data) { data_ptr = data; pos = 0; } - uint32_t GetNext(int bits); - void SkipNext(int bits) { pos += bits; } - void MarkerBit(void); - private: - uint8_t *data_ptr; - int pos; -}; +//#define MPEG2trans_DEBUG -class SetBits +MPEG2trans::MPEG2trans(ProgramInfo *pginfo) { - public: - SetBits(uint8_t *data) { data_ptr = data; pos = 0; } - void SetNext(uint32_t value, int bits); - void SkipNext(int bits) { pos += bits; } - private: - uint8_t *data_ptr; - int pos; -}; + m_pginfo = pginfo; -#define get_pos(file_buf) ((file_buf)->pos - ((file_buf)->last_byte - (file_buf)->blkptr)) -#define READ_PTS ((GETBITS(0, 3)<<30) | (marker_bit() & 0) | (GETBITS(0, 15) << 15) | \ - (marker_bit() & 0) | GETBITS(0, 15) | (marker_bit() & 0)) -#define READ_PTS_EXT (GETBITS(0, 9) | (marker_bit() & 0)) -#define PTS2FLOAT(pts) ((float)(pts).val * (outputContext->time_base.num) / (outputContext->time_base.den)) -#define PTS2INT(pts, st) ((int64_t)(pts).val * AV_TIME_BASE * (st->time_base.num) / (st->time_base.den)) -#define INT2PTS(val, st) ((val) * (st->time_base.den) / (st->time_base.num) / AV_TIME_BASE) + inputFC = NULL; + outputFC = NULL; -const int ac3_ratetable[] = { 32, 40, 48, 56, 64, 80, 96, 112, - 128, 160, 192, 224, 256, 320, 384, 448, - 512, 576, 640}; -const uint8_t ac3_halfrate[12] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3}; + // Register all formats and codecs + av_register_all(); +} -int mp2_debug = 0; -void DPRINTF(int level, const char *format, ...) +MPEG2trans::~MPEG2trans() { - if (level < mp2_debug) { - va_list ap; - va_start(ap, format); - vprintf(format, ap); - va_end(ap); - } } -void FrameBuffer::setPkt(AVPacket *newpkt, int64_t del) +bool MPEG2trans::InitAV(QString &inputfile) { - if (newpkt->size + pkt.size > size) + int ret; + + // Open recording + ret = av_open_input_file(&inputFC, inputfile.ascii(), NULL, 0, NULL); + if (ret != 0) { - pkt.data = (uint8_t *)realloc(pkt.data, pkt.size + newpkt->size); - size = pkt.size + newpkt->size; + cerr << "Couldn't open input file, error #" << ret << endl; + return false; } - memcpy(pkt.data + pkt.size, newpkt->data, newpkt->size); - pkt.size += newpkt->size; - pkt.pts = newpkt->pts; - pkt.flags = newpkt->flags; - delta = del; -} -void FrameBuffer::setPkt(uint8_t *data, uint32_t newsize, int64_t newpts, - int64_t del) -{ - AVPacket newpkt; - newpkt.size = newsize; - newpkt.pts = newpts; - newpkt.data = data; - newpkt.flags = 0; - setPkt(&newpkt, del); -} - -uint32_t GetBits::GetNext(int num) -{ - uint32_t value = 0, gb_long; - int offset, offset_r, offset_b; - - offset = pos >> 3; - offset_r = pos & 0x07; - offset_b = 32 - offset_r; - gb_long = ntohl(*((uint32_t *) (data_ptr + offset))); - value = gb_long >> (offset_b - num); - value = value & (0xffffffff >> (32 - num)); - pos+=num; - return value; -} - -void GetBits::MarkerBit(void) -{ - if (!GetNext(1)) + // Getting stream information + ret = av_find_stream_info(inputFC); + if (ret < 0) { - VERBOSE(VB_IMPORTANT, "Marker bit was not valid!"); - exit(TRANSCODE_BUGGY_EXIT_INVALID_MARKER); + cerr << "Couldn't get stream info, error #" << ret << endl; + av_close_input_file(inputFC); + inputFC = NULL; + return false; } -} -void SetBits::SetNext(uint32_t value, int num) -{ - uint32_t sb_long, mask; - int offset, offset_r, offset_b; + // Dump stream information + dump_format(inputFC, 0, inputfile.ascii(), false); - offset = pos >> 3; - offset_r = pos & 0x07; - offset_b = 32 - offset_r; - mask = ~((uint32_t)((1 << num) -1) << (offset_b - num)); - sb_long = ntohl(*((unsigned long *) (data_ptr + offset))); - value = value << (offset_b - num); - sb_long = (sb_long & mask) | value; - *((unsigned long *)(data_ptr + offset)) = htonl(sb_long); - pos += num; + return true; } -MPEG2trans::MPEG2trans(QMap *map) +bool MPEG2trans::InitOutput(QString &outfile) { - int i; - video_width = 0; - video_height = 0; - video_aspect = 0; - video_frame_rate = 29970; - video_bitrate = 0; - pic_frame_count = 0; + int ret; - audio_freq = 48000; - audio_bitrate = 0; + // Allocate output format context + outputFC = av_alloc_format_context(); + if (!outputFC) + { + cerr << "Couldn't allocate output context\n"; + av_close_input_file(inputFC); + inputFC = NULL; + return false; + } - goppts_delta = 0; + // Getting output file format + AVOutputFormat *fmt = guess_format("dvd", outfile.ascii(), "video/mpeg"); +// AVOutputFormat *fmt = guess_format("vob", outfile.ascii(), "video/mpeg"); + if (!fmt) + { + cerr << "Couldn't get VOB output context\n"; + av_close_input_file(inputFC); + inputFC = NULL; + return false; + } - fixed_gop_ts = NULL; + outputFC->oformat = fmt; - chopping = false; - chop_end = false; - skipped_frames = 0; + // Allocate output streams + for (int i = 0; i < inputFC->nb_streams; i++) + { + AVStream *ist = inputFC->streams[i]; + AVStream *ost = av_new_stream(outputFC, ist->id); - got_audio = false; - got_video = false; - init_av = false; + ost->stream_copy = 1; - outputContext = NULL; - inputContext = NULL; - - audioout_st = NULL; - videoout_st = NULL; - - last_frame_number = 0; - last_gop_pts = 0; - chop_start_pts = 0; - video_frame_state = 0; - - for (i = 0; i < 50; i++) - { - audioPool.push(new FrameBuffer); - videoPool.push(new FrameBuffer); - } - if (map) - { - QMap::Iterator mapIter; - for (mapIter = map->begin(); mapIter != map->end(); mapIter++) + // copy codec data from input streams + if (ost->codec && ist->codec) { - if (mapIter.data()) + ost->codec->codec_id = ist->codec->codec_id; + ost->codec->codec_type = ist->codec->codec_type; + if (!ost->codec->codec_tag) + ost->codec->codec_tag = ist->codec->codec_tag; + ost->codec->bit_rate = ist->codec->bit_rate; + ost->codec->extradata = ist->codec->extradata; + ost->codec->extradata_size = ist->codec->extradata_size; + switch (ost->codec->codec_type) { - long long start; - start = mapIter.key(); - mapIter++; - if (mapIter != map->end() && ! mapIter.data()) - cutlistMap[start] = mapIter.key(); + case CODEC_TYPE_AUDIO: + ost->codec->sample_rate = ist->codec->sample_rate; + ost->codec->channels = ist->codec->channels; + ost->codec->frame_size = ist->codec->frame_size; + ost->codec->block_align = ist->codec->block_align; + break; + case CODEC_TYPE_VIDEO: + ost->codec->time_base = ist->codec->time_base; + ost->codec->width = ist->codec->width; + ost->codec->height = ist->codec->height; + ost->codec->has_b_frames = ist->codec->has_b_frames; + break; + default: + cerr << "dropping unknown stream type " + << ost->codec->codec_type << endl; } } - cutlistIter = cutlistMap.begin(); } - use_ac3 = false; - audioin_index = -1; - videoin_index = -1; - av_register_all(); -} + strncpy(outputFC->filename, outfile.ascii(), sizeof(outputFC->filename)); -MPEG2trans::~MPEG2trans(void) { -}; + // Dump output format + dump_format(outputFC, 0, outfile.ascii(), 1); -void MPEG2trans::write_muxed_frame(AVStream *stream, AVPacket *pkt, int advance, int64_t delta) -{ - static int64_t audpts, vidpts; - if (stream == audioout_st) + // Open output file + ret = url_fopen(&outputFC->pb, outfile.ascii(), URL_WRONLY); + if (ret < 0) { - FrameBuffer *buffer = audioPool.pop(); - buffer->setPkt(pkt, delta); - audioQueue.enqueue(buffer); - if (audioPool.isEmpty() ) - { - VERBOSE(VB_IMPORTANT, "Ran out of audio buffers!"); - exit(TRANSCODE_BUGGY_EXIT_NO_AUDIO_BUFFERS); - } - DPRINTF(1, "AUDMUX : %d buffers left\n", audioPool.count()); + cerr << "Couldn't open output file, error #" << ret << endl; + av_close_input_file(inputFC); + inputFC = NULL; + return false; } - else - { - FrameBuffer *buffer = videoPool.pop(); - buffer->setPkt(pkt, delta); - if (advance) - videoQueue.enqueue(buffer); - else - { - videoPool.push(buffer); - if (videoQueue.isEmpty()) - return; - } - if (videoPool.isEmpty()) - { - VERBOSE(VB_IMPORTANT, "Ran out of video buffers!"); - exit(TRANSCODE_BUGGY_EXIT_NO_VIDEO_BUFFERS); - } - DPRINTF(1, "VIDMUX : %d buffers left\n", videoPool.count()); - } - if (! got_audio || ! got_video) - return; - if (! init_av) - { - if (videoQueue.isEmpty()) - return; - while (! audioQueue.isEmpty() && - audioQueue.head()->getPTS() < videoQueue.head()->getPTS()) - { - FrameBuffer *buffer = audioQueue.dequeue(); - buffer->Reset(); - audioPool.push(buffer); - } - if (audioQueue.isEmpty()) - return; - init_av = 1; - init_videoout_stream(); - init_audioout_stream(); - /* set the output parameters (must be done even if no - parameters). */ - if (av_set_parameters(outputContext, NULL) < 0) - { - VERBOSE(VB_IMPORTANT, "Invalid output format parameters"); - exit(TRANSCODE_BUGGY_EXIT_INVALID_OUT_PARAMS); - } - /* write the stream header, if any */ - av_write_header(outputContext); - dump_format(outputContext, 0, outputContext->filename, 1); - videoout_st->pts.val = INT2PTS(videoQueue.head()->getPTS(), videoout_st); - } - while ((vidpts < audpts && ! videoQueue.isEmpty()) || - (audpts <= vidpts && ! audioQueue.isEmpty())) + // Set output parameters + ret = av_set_parameters(outputFC, NULL); + if (ret < 0) { - AVFrame avframe; - memset(&avframe, 0, sizeof(AVFrame)); - DPRINTF(1, "audpts: %lld vidpts: %lld\n", audpts, vidpts); - if (audpts <= vidpts) { - FrameBuffer *buf = audioQueue.dequeue(); - int64_t bufpts = buf->getPTS() - buf->getDelta(); - audioout_st->pts.val = INT2PTS(bufpts, audioout_st); -// long long orig = PTS2INT(audioout_st->pts, audioout_st); - audioout_st->codec->coded_frame= &avframe; - if (av_write_frame(outputContext, buf->getPkt()) != 0) - { - VERBOSE(VB_IMPORTANT, "Error while writing audio frame"); - exit(TRANSCODE_BUGGY_EXIT_WRITE_FRAME_ERROR); - } - DPRINTF(1, "AUDIO PTS (initial): %lld (stored): %lld\n", buf->getPTS(), PTS2INT(audioout_st->pts, audioout_st)); - audpts += PTS2INT(audioout_st->pts, audioout_st) - bufpts; - buf->Reset(); - audioPool.push(buf); - } - else - { - FrameBuffer *buf = videoQueue.dequeue(); - int64_t bufpts = buf->getPTS() - buf->getDelta(); - videoout_st->pts.val = INT2PTS(bufpts, videoout_st); -// int64_t oldpts = PTS2INT(videoout_st->pts, videoout_st); - videoout_st->codec->coded_frame= &avframe; - if (av_write_frame(outputContext, buf->getPkt()) != 0) - { - VERBOSE(VB_IMPORTANT, "Error while writing video frame"); - exit(TRANSCODE_BUGGY_EXIT_WRITE_FRAME_ERROR); - } - DPRINTF(1, "VIDEO PTS (initial): %lld (stored): %lld\n", buf->getPTS(), PTS2INT(videoout_st->pts, videoout_st)); - vidpts += PTS2INT(videoout_st->pts, videoout_st) - bufpts; - buf->Reset(); - videoPool.push(buf); - } + cerr << "Couldn't set parameters, error #" << ret << endl; + av_close_input_file(inputFC); + inputFC = NULL; + return false; } - // empty audio buffer after writing the last video/audio frames - if (chopping && videoQueue.isEmpty()) - { - while(! audioQueue.isEmpty()) - { - FrameBuffer *buf = audioQueue.dequeue(); - buf->Reset(); - audioPool.push(buf); - } - } -} -bool MPEG2trans::check_ac3_header(uint8_t *buf) -{ - if ((buf[0] == 0x0b) && (buf[1] == 0x77)) - return true; - return false; -} - -bool MPEG2trans::check_mp2_header(uint8_t *buf) -{ - if (buf[0] == 0xff && (buf[1] & 0xf0) == 0xf0) - return true; - return false; -} + outputFC->max_delay = 700000; -bool MPEG2trans::check_video_header(uint8_t *buf) -{ - if (buf[0] == 0x00 && buf[1] == 0x00 && buf[2] == 0x01) - return true; - return false; + return true; } -uint32_t MPEG2trans::process_ac3_audio(AVPacket *pkt) +AVPacketList *MPEG2trans::ReadGop(int index, int64_t *min_dts, int64_t *min_pts, int64_t *end_pts) { - uint32_t frame_len; - uint8_t *buf = pkt->data; - if (check_ac3_header(buf)) { - uint32_t freq, bitrate, pad, bsid, flags; - GetBits *gb = new GetBits(pkt->data + 4); - freq = gb->GetNext(2); - bitrate = gb->GetNext(5); - pad = gb->GetNext(1); - bsid = gb->GetNext(5); - gb->SkipNext(3); //??? - flags = gb->GetNext(4); - delete gb; - if (bitrate < 19 && bsid < 12 && freq != 3) { - int half; - half = ac3_halfrate[bsid]; - audio_bitrate = (1000 * ac3_ratetable[bitrate]) >> half; - switch(freq) { - case 0 : audio_freq = 48000 >> half; break; - case 1 : audio_freq = 44100 >> half; break; - case 2 : audio_freq = 32000 >> half; break; - } - frame_len = 192 * audio_bitrate / audio_freq + pad; - return frame_len; - } - } - return 0; -} + AVPacketList *pkts = NULL; + AVPacket pkt; + int iframe_count = 0; -uint32_t MPEG2trans::process_mp2_audio(AVPacket *pkt) -{ - uint32_t frame_len = 0; - uint8_t *buf = pkt->data; + av_init_packet(&pkt); - if (check_mp2_header(buf)) + do { - uint8_t pad; - if (buf[1] != 0xfd) - { - VERBOSE(VB_IMPORTANT, "Only MP2 audio is currently supported"); - exit(TRANSCODE_BUGGY_EXIT_INVALID_AUDIO); - } - GetBits *gb = new GetBits(buf + 2); - audio_bitrate = gb->GetNext(4); - audio_freq = gb->GetNext(2); - pad = gb->GetNext(1); - delete gb; - switch (audio_bitrate) { - case 1: audio_bitrate = 32000; break; - case 2: audio_bitrate = 48000; break; - case 3: audio_bitrate = 56000; break; - case 4: audio_bitrate = 64000; break; - case 5: audio_bitrate = 80000; break; - case 6: audio_bitrate = 96000; break; - case 7: audio_bitrate = 112000; break; - case 8: audio_bitrate = 128000; break; - case 9: audio_bitrate = 160000; break; - case 10: audio_bitrate = 192000; break; - case 11: audio_bitrate = 224000; break; - case 12: audio_bitrate = 256000; break; - case 13: audio_bitrate = 320000; break; - case 14: audio_bitrate = 384000; break; - default: - fprintf(stderr, "Unsupported bitrate 0x%02x\n", audio_bitrate); - exit(TRANSCODE_BUGGY_EXIT_INVALID_AUDIO); - } - switch (audio_freq) { - case 0: audio_freq = 44100; break; - case 1: audio_freq = 48000; break; - case 2: audio_freq = 32000; break; - default: - fprintf(stderr, "Unsupported frequency 0x%02x\n", audio_freq); - exit(TRANSCODE_BUGGY_EXIT_INVALID_AUDIO); - } - frame_len = (144 * audio_bitrate / audio_freq) + pad; - return frame_len; - } - return 0; -} + int ret = av_read_frame(inputFC, &pkt); + if (ret < 0) break; -void MPEG2trans::process_audio(AVPacket *pkt) -{ - int32_t frame_len; - audioFrame.setPkt(pkt); - AVPacket *thispkt = audioFrame.getPkt(); - if (use_ac3) - frame_len = process_ac3_audio(thispkt); - else - frame_len = process_mp2_audio(thispkt); - if (frame_len == pkt->size) { - got_audio = 1; - bool processed_frame = false; + if ((inputFC->streams[pkt.stream_index]->codec->codec_type == CODEC_TYPE_VIDEO) && (pkt.flags & PKT_FLAG_KEY)) + iframe_count++; - if (chopping && thispkt->pts >= chop_start_pts || chop_end) + if (iframe_count < 2) { - while(! audskipQueue.isEmpty() && - audskipQueue.head()->pts < last_gop_pts) + if (!pkts) { - AVPacket *store = audskipQueue.dequeue(); - delete store; + pkts = new AVPacketList; + pkts->next = NULL; + pkts->pkt = pkt; } - if (chopping && thispkt->pts >= last_gop_pts || - chop_end && pic_frame_count < 2) + else { - // store audio frame - AVPacket *store = new AVPacket; - store->data = new uint8_t[frame_len]; - memcpy(store->data, thispkt->data, frame_len); - store->size = frame_len; - store->pts = thispkt->pts; - audskipQueue.enqueue(store); + AVPacketList *t = pkts; + + while (t->next != NULL) t = t->next; + + t->next = new AVPacketList; + t->next->next = NULL; + t->next->pkt = pkt; } - if (! chop_end || pic_frame_count < 2) - processed_frame = true; - } - if (! processed_frame) - { - while(! audskipQueue.isEmpty()) + + if (pkt.stream_index == index) { - AVPacket *store = audskipQueue.dequeue(); - write_muxed_frame(audioout_st, store, true, goppts_delta); - delete [] store->data; - delete store; + if (pkt.dts != (int64_t)AV_NOPTS_VALUE && min_dts) + if ((pkt.dts < *min_dts) || (*min_dts == (int64_t)AV_NOPTS_VALUE)) *min_dts = pkt.dts; + if (pkt.pts != (int64_t)AV_NOPTS_VALUE && min_pts) + if ((pkt.pts < *min_pts) || (*min_pts == (int64_t)AV_NOPTS_VALUE)) *min_pts = pkt.pts; + if (pkt.pts != (int64_t)AV_NOPTS_VALUE && end_pts) + if ((pkt.pts + pkt.duration > *end_pts) || (*end_pts == (int64_t)AV_NOPTS_VALUE)) *end_pts = pkt.pts + pkt.duration; } - write_muxed_frame(audioout_st, thispkt, true, goppts_delta); } - DPRINTF(1, "Audio frame: %d bytes freq: %d bitrate: %d ptsdel: %lld\n", - frame_len, audio_freq, audio_bitrate, goppts_delta); - if (thispkt->size != frame_len) - { - memmove(thispkt->data, thispkt->data + frame_len, (thispkt->size - frame_len)); - thispkt->size -= frame_len; - } - else - { - thispkt->size = 0; - return; - } - } - uint8_t *frame_start = thispkt->data; - while (thispkt->size && - (use_ac3 && !check_ac3_header(frame_start) || - ! use_ac3 && check_mp2_header(frame_start))) + else if (pkt.destruct) pkt.destruct(&pkt); + + } while (iframe_count < 2); + + return pkts; +} + +void MPEG2trans::FreeGop(AVPacketList *pkts) +{ + AVPacketList *t = pkts; + AVPacketList *u; + + while (t) { - frame_start++; - thispkt->size--; + if (t->pkt.destruct) t->pkt.destruct(&t->pkt); + + u = t; + t = t->next; + delete u; } - if (thispkt->size) { - memmove(thispkt->data, frame_start, thispkt->size); - DPRINTF(1, "Found %d bytes of garbage data before header\n", - frame_start - thispkt->data); - } else { - DPRINTF(1, "Found %d bytes of garbage data, but no header\n", - frame_start - thispkt->data); - } } -bool MPEG2trans::process_video(AVPacket *pkt, bool gopsearch) +int MPEG2trans::DoTranscode(QString &infile, QString &tmpfile, bool useCutlist, bool chkTranscodeDB) { - bool skip_pic_frame = false; - bool found_gop = false; - uint8_t *vidblkptr, *frame_start = NULL; - uint32_t len; + QMap deleteMap; + QMap posMap; - videoFrame.Reset(); - videoFrame.setPkt(pkt); - AVPacket *thispkt = videoFrame.getPkt(); + AVPacketList *pkts; + AVPacket pkt; - vidblkptr = thispkt->data; - len = thispkt->size; + int video_index = -1; - // a pkt can contain SEQ and GOP frames, but it is gauranteed that - // there is one and only one PIC frame in the pkt, and that will be - // the last frame in the pkt. - while (len >= 4 && check_video_header(vidblkptr)) + int64_t start_pts; + int64_t end_pts; + int64_t min_dts = AV_NOPTS_VALUE; + int64_t delta_pts; + int64_t next_start_pts = AV_NOPTS_VALUE; + + int total_frames = 0; + int completed_frames = 0; + + int ret; + + int jobID = -1; + if (chkTranscodeDB) { - uint32_t frame_len = 0; - uint32_t pos = vidblkptr - thispkt->data; - if (vidblkptr[3] == 0xb3) // sequence header + jobID = JobQueue::GetJobID(JOB_TRANSCODE, m_pginfo->chanid, m_pginfo->startts); + + if (jobID < 0) { - if (gopsearch) - return true; - if (video_width == 0) - { - frame_len = 4 + parse_seq_header(vidblkptr + 4, true); - video_frame_state |= 0x01; - got_video = 1; - } - else - frame_len = 4 + parse_seq_header(vidblkptr + 4, false); - if (! chopping && cutlistIter != cutlistMap.end() && - last_frame_number >= cutlistIter.key()) - { - chopping = 1; - chop_start_pts = thispkt->pts; - } - seqFrame.Reset(); - seqFrame.setPkt(vidblkptr, frame_len, thispkt->pts); - DPRINTF(1, "pos: 0x%lx SEQ-HEADER: w: %d " - "h: %d a/r: %d rate: %d br: %d\n", - pos, video_width, video_height, video_aspect, - video_frame_rate, video_bitrate); + VERBOSE(VB_IMPORTANT, "ERROR, Transcode called from JobQueue but " + "no jobID found!"); + return TRANSCODE_EXIT_INVALID_CMDLINE; } - else if (vidblkptr[3] == 0xb8) - { - if (gopsearch) - return true; - gop_timestamp_t gop_ts; - bool closed, broken; - if (! (video_frame_state | 0x01)) - continue; - video_frame_state |= 0x02; - found_gop = true; - last_gop_pts = thispkt->pts; - frame_start = vidblkptr; - if (chop_end) - chop_end = false; - last_frame_number += pic_frame_count; - if (! chopping && cutlistIter != cutlistMap.end() && - last_frame_number >= cutlistIter.key() && - last_frame_number < cutlistIter.data()) - { - chopping = 1; - chop_start_pts = thispkt->pts; - } - else if (chopping && cutlistIter != cutlistMap.end() && - last_frame_number >= cutlistIter.data()) - { - chopping = 0; - chop_end = true; - cutlistIter++; - } - frame_len = 4+ get_gop_data(vidblkptr + 4, &gop_ts, - &closed, &broken); - if (fixed_gop_ts) - { - if (! chopping) - update_timestamp(fixed_gop_ts, &gop_ts); - } - else - { - fixed_gop_ts = new gop_timestamp_t; - *fixed_gop_ts = gop_ts; - } - int64_t goppts; - goppts = (fixed_gop_ts->hour * 3600 + - fixed_gop_ts->min * 60 + - fixed_gop_ts->sec) * AV_TIME_BASE + - fixed_gop_ts->pic * AV_TIME_BASE / video_frame_rate; - goppts_delta = (gop_ts.hour * 3600 + gop_ts.min * 60 + - gop_ts.sec ) * AV_TIME_BASE + - gop_ts.pic * AV_TIME_BASE / video_frame_rate - - goppts; - if (chop_end) - { - closed = 0; - broken = 1; - } - set_gop_data(vidblkptr + 4, fixed_gop_ts, closed, broken); - pic_frame_count = 0; - skipped_frames = 0; - DPRINTF(1, "pos: 0x%lx GOP-HEADER %02d:%02d:%02d " - "#: %d c: %d b: %d\n", pos, fixed_gop_ts->hour, - fixed_gop_ts->min, fixed_gop_ts->sec, - fixed_gop_ts->pic, closed, broken); - } - else if (vidblkptr[3] == 0x00) - { - if (gopsearch) - return false; - int num, type; - char pictype; - frame_len = len; - if (video_frame_state != 0x03) - continue; - if (! frame_start) - frame_start = vidblkptr; - GetBits *gb = new GetBits(vidblkptr + 4); - num = gb->GetNext(10); - type = gb->GetNext(3); - delete gb; - switch (type) { - case 1: pictype = 'I'; break; - case 2: pictype = 'P'; break; - case 3: pictype = 'B'; break; - case 4: pictype = 'D'; break; - default: pictype = 'X'; break; - } - if (0 && chop_end) { - if (pic_frame_count < 2 && pictype == 'B') { - skip_pic_frame = 1; - skipped_frames++; - } else { - if (pic_frame_count == 0) - num = 0; - else - num -= skipped_frames; - update_pic_frame_num(vidblkptr + 4,num); - pic_frame_count++; - } - } - else - pic_frame_count++; - DPRINTF(1, "pos: 0x%lx PIC-HEADER %c-Frame %s#: %d\n", pos, - pictype, ((skip_pic_frame)? "SKIPPED ":""), num); - if (pictype == 'X') DPRINTF(1, "Frame type: %d\n", type); - } - else if (vidblkptr[3] == 0xbe) - { - uint32_t skip = (vidblkptr[4] << 8) + vidblkptr[5]; - frame_len = skip + 6; - DPRINTF(1, "pos: 0x%lx PAD-HEADER (%d bytes)\n", pos, skip); - } - vidblkptr += frame_len; - len -= frame_len; + + JobQueue::ChangeJobComment(jobID, "0% " + QObject::tr("Completed")); } - if (gopsearch) - return false; - if ((uint32_t)(vidblkptr - thispkt->data) == videoFrame.getSize()) - { - if (! chopping && !skip_pic_frame && frame_start) - { - if (found_gop) - write_muxed_frame(videoout_st, seqFrame.getPkt(), false); - AVPacket picpkt; - picpkt.pts = thispkt->pts; - picpkt.data = frame_start; - picpkt.size = thispkt->size - (frame_start - thispkt->data); - write_muxed_frame(videoout_st, &picpkt, true, goppts_delta); - } - } - else // something went terribly wrong! - { - exit(TRANSCODE_BUGGY_EXIT_INVALID_VIDEO); - } - return(false); -} -int MPEG2trans::DoTranscode(QString inputFilename, QString outputFilename) -{ - AVPacket pkt1, *pkt = &pkt1; - AVFormatParameters params, *ap = ¶ms; - int i, err; + cerr << "Title: " << m_pginfo->title.ascii() << endl << flush; - inputContext = NULL; //av_mallocz(sizeof(AVFormatContext)); - ap = (AVFormatParameters*) calloc(sizeof(AVFormatParameters), 1); - err = av_open_input_file(&inputContext, inputFilename, NULL, 0, ap); - if (err < 0) + m_pginfo->GetPositionMap(posMap, MARK_GOP_BYFRAME); + + if (useCutlist) + m_pginfo->GetCutList(deleteMap); + else { - VERBOSE(VB_IMPORTANT, QString("Failed to open file '%1', error code %2") - .arg(inputFilename).arg(err)); - return 1; + QMap::Iterator pMapIter; + + pMapIter = posMap.begin(); + deleteMap[pMapIter.key()] = 0; + + pMapIter = posMap.end(); + pMapIter--; + deleteMap[pMapIter.key()] = 1; } - err = av_find_stream_info(inputContext); - if (err < 0) + + QMap::Iterator pMapIter; +#ifdef MPEG2trans_DEBUG + // Iterate over the position map + for (pMapIter = posMap.begin(); pMapIter != posMap.end(); pMapIter++) { - VERBOSE(VB_IMPORTANT, - QString("Could not find stream paramters for '%1'," - " error code %2").arg(inputFilename).arg(err)); - return 2; + cerr << "posMap[" << pMapIter.key() << "] = " << pMapIter.data() << endl; } - for (i = 0; i < inputContext->nb_streams; i++) +#endif + + // Iterate over the cut list + QMap::Iterator dMapIter; + for (dMapIter = deleteMap.begin(); dMapIter != deleteMap.end(); ) { - AVCodecContext *enc = inputContext->streams[i]->codec; - VERBOSE(VB_GENERAL, QString("Stream: %1 Type: %2") - .arg(i).arg(enc->codec_type)); - switch(enc->codec_type) { - case CODEC_TYPE_AUDIO: - if (!use_ac3 && - (inputContext->streams[i])->codec->codec_id == CODEC_ID_AC3) { - use_ac3 = 1; - audioin_index = i; - } else if (audioin_index == -1) - audioin_index = i; - break; - case CODEC_TYPE_VIDEO: - videoin_index = i; - break; - default: - break; +#ifdef MPEG2trans_DEBUG + cerr << "delMap[" << dMapIter.key() << "] = " << dMapIter.data() << endl; +#endif + if (dMapIter.data() == 0) + { + int start_frame = dMapIter.key(); + dMapIter++; + +#ifdef MPEG2trans_DEBUG + cerr << "delMap[" << dMapIter.key() << "] = " << dMapIter.data() << endl; +#endif + if (dMapIter != deleteMap.end()) + { + int end_frame = dMapIter.key(); + total_frames += end_frame - start_frame; + } + else break; } + + dMapIter++; } - dump_format(inputContext, 0, inputFilename, 0); - AVOutputFormat *fmt; - /* initialize libavcodec, and register all codecs and formats */ - - /* auto detect the output format from the name. default is - mpeg. */ - fmt = guess_format("vob", NULL, NULL); - if (!fmt) - { - VERBOSE(VB_IMPORTANT, "Could not find suitable output format."); - return 3; - } - - /* allocate the output media context */ - outputContext = (AVFormatContext *)av_mallocz(sizeof(AVFormatContext)); - if (!outputContext) - { - VERBOSE(VB_IMPORTANT, "Could not allocate memory."); - return 4; - } - outputContext->oformat = fmt; - snprintf(outputContext->filename, - sizeof(outputContext->filename), "%s", outputFilename.ascii()); + /*============ initialise AV ===============*/ + if (!InitAV(infile)) + return TRANSCODE_EXIT_UNKNOWN_ERROR; - /* add the audio and video streams using the default format codecs - and initialize the codecs */ - videoout_st = av_new_stream(outputContext, 0); - audioout_st = av_new_stream(outputContext, 1); + if (!InitOutput(tmpfile)) + return TRANSCODE_EXIT_UNKNOWN_ERROR; - if (!videoout_st || !audioout_st) - { - VERBOSE(VB_IMPORTANT, - "Could not find relevant audio and video streams!"); - return 5; - } + /*=========== transcoding/cuting ===========*/ + av_init_packet(&pkt); - /* open the output file, if needed */ - if (url_fopen(&outputContext->pb, outputFilename, URL_WRONLY) < 0) - { - VERBOSE(VB_IMPORTANT, QString("Could not open output file '%1'") - .arg(outputFilename)); - return 6; - } + // initialise cut list iterator + dMapIter = deleteMap.begin(); - while (av_read_frame(inputContext, pkt) >= 0) + // seek to first entry in deleteMap +#ifdef MPEG2trans_DEBUG + cerr << "first entry in dMap: " << dMapIter.key() << endl; + cerr << "infile offset: " << posMap[dMapIter.key()] << endl; +#endif + + // write stream header + ret = av_write_header(outputFC); + if (ret < 0) { - DPRINTF(1, "PKT (%s): %lu %llu\n",((pkt->stream_index == audioin_index) ? "AUDIO" : "VIDEO"), - pkt->size, pkt->pts); - if (pkt->stream_index == audioin_index) - process_audio(pkt); - else if (pkt->stream_index == videoin_index) - process_video(pkt); + cerr << "Error writing output header\n"; + return TRANSCODE_EXIT_UNKNOWN_ERROR; } - av_close_input_file(inputContext); - - /* write the trailer, if any */ - av_write_trailer(outputContext); - /* free the streams */ - while (outputContext->nb_streams) + /* find the index of the first video stream */ + for (int i = 0; i < inputFC->nb_streams; i++) { - av_freep(&outputContext->streams[--outputContext->nb_streams]); - } - - /* close the output file */ - url_fclose(&outputContext->pb); - - /* free the stream */ - av_free(outputContext); - return 0; -} - -uint32_t MPEG2trans::parse_seq_header(uint8_t *PES_data, bool store) -{ - uint32_t len = 0; - GetBits *gb = new GetBits(PES_data); - if (store) - { - int rate; - video_width = gb->GetNext(12); - video_height = gb->GetNext(12); - video_aspect = gb->GetNext(4); - rate = gb->GetNext(4); - video_bitrate = gb->GetNext(18) * 400; - switch (rate) { - case 1: video_frame_rate = 23976; break; - case 2: video_frame_rate = 24000; break; - case 3: video_frame_rate = 25000; break; - case 4: video_frame_rate = 29970; break; - case 5: video_frame_rate = 30000; break; - case 6: video_frame_rate = 50000; break; - case 7: video_frame_rate = 59940; break; - case 8: video_frame_rate = 60000; break; + if (inputFC->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO) + { + video_index = i; + break; } } - else - { - gb->SkipNext(50); - } - gb->SkipNext(12); - if (gb->GetNext(1)) - { - gb->SkipNext(8*64); - len += 64; - } - if (gb->GetNext(1)) - { - gb->SkipNext(8*64); - len += 64; - } - delete gb; - len += 8; - len += get_ext_frame(PES_data + len); - return len; -} -// Must be careful using get_ext_frame. There is no bounds checking -// This is ok, because a SEQ or GOP frame must contain a pic frame -// in the same pkt. get_ext_frame should only be used when it is -// gauranteed that there is another video frame in the packet! -uint32_t MPEG2trans::get_ext_frame(uint8_t *PES_data) -{ - uint32_t len = 0; - bool done = false; - while (! done) + /* check if no video stream */ + if (video_index == -1) + return TRANSCODE_BUGGY_EXIT_INVALID_VIDEO; + + /* iterate over the entries in the delete map */ + while (dMapIter != deleteMap.end()) { - if (! check_video_header(PES_data)) + if (dMapIter.data() == 0) // keep frames { - len++; - PES_data++; - } - else if (PES_data[3] == 0xb2 || PES_data[3] == 0xb5) - { - len += 4; - PES_data +=4; - } - else - done = true; - } - return len; -} + long long start_key = dMapIter.key(); + while ((posMap.find(start_key) == posMap.end()) && (start_key >= 0)) start_key--; + if (posMap.find(start_key) == posMap.end()) + { +#ifdef MPEG2trans_DEBUG + cerr << "Couldn't find keyframe to start from\n"; +#endif + continue; + } +#ifdef MPEG2trans_DEBUG + cerr << "Saving from frame #" << start_key; +#endif -uint32_t MPEG2trans::get_gop_data(uint8_t *PES_data, gop_timestamp_t *ts, - bool *closed, bool *broken) -{ - uint32_t len = 4; - GetBits *gb = new GetBits(PES_data); - ts->drop = gb->GetNext(1); - ts->hour = gb->GetNext(5); - ts->min = gb->GetNext(6); - gb->MarkerBit(); - ts->sec = gb->GetNext(6); - ts->pic = gb->GetNext(6); - *closed = gb->GetNext(1); - *broken = gb->GetNext(1); - gb->SkipNext(5); - delete gb; - len += get_ext_frame(PES_data + len); - return len; -} + dMapIter++; + if (dMapIter == deleteMap.end()) + { +#ifdef MPEG2trans_DEBUG + cerr << "Reached end of delete map\n"; +#endif + continue; + } + long long end_key = dMapIter.key(); + while ((posMap.find(end_key) == posMap.end()) && (end_key >= 0)) end_key--; + if (posMap.find(end_key) == posMap.end()) + { +#ifdef MPEG2trang_DEBUG + cerr << "Couldn't find keyframe to start from\n"; +#endif + continue; + } +#ifdef MPEG2trans_DEBUG + cerr << " to end of GOP starting at frame #" << end_key << endl; +#endif -void MPEG2trans::set_gop_data(uint8_t *PES_data, gop_timestamp_t *ts, - bool closed, bool broken) -{ - SetBits *sb = new SetBits(PES_data); - sb->SetNext(ts->drop, 1); - sb->SetNext(ts->hour, 5); - sb->SetNext(ts->min, 6); - sb->SetNext(1, 1); - sb->SetNext(ts->sec, 6); - sb->SetNext(ts->pic, 6); - sb->SetNext(closed, 1); - sb->SetNext(broken, 1); - delete sb; -} + /* seek to end gop */ + av_read_frame_flush(inputFC); + url_fseek(&inputFC->pb, posMap[end_key], SEEK_SET); -void MPEG2trans::update_timestamp(gop_timestamp_t *last_ts, gop_timestamp_t *ts) -{ - uint32_t framerate; + /* read in last gop of the save section */ + end_pts = AV_NOPTS_VALUE; + pkts = ReadGop(video_index, NULL, NULL, &end_pts); + FreeGop(pkts); - framerate = (video_frame_rate + 500) / 1000; - last_ts->pic += pic_frame_count; - while (last_ts->pic >= framerate) { - last_ts->pic -= framerate; - last_ts->sec += 1; - } - while (last_ts->sec >= 60) { - last_ts->sec -=60; - last_ts->min +=1; - } - while (last_ts->min >= 60) { - last_ts->min -=60; - last_ts->hour +=1; - } - DPRINTF(1, "Computed time: %02d:%02d:%02d.%02d " - "Actual time: %02d:%02d:%02d.%02d %d\n", - last_ts->hour, last_ts->min, last_ts->sec, last_ts->pic, - ts->hour, ts->min, ts->sec, ts->pic, pic_frame_count); -} + /* seek to start gop */ + av_read_frame_flush(inputFC); + url_fseek(&inputFC->pb, posMap[start_key], SEEK_SET); -void MPEG2trans::update_pic_frame_num(uint8_t *PES_data, int num) -{ - uint8_t val[2]; - val[0] = (num >> 2) && 0xff; - val[1] = (num & 0x03) << 6; - val[1] |= (PES_data[1] & 0x3f); - PES_data[0] = val[0]; - PES_data[1] = val[1]; -} + /* read in the first gop of the save section */ + delta_pts = AV_NOPTS_VALUE; + start_pts = AV_NOPTS_VALUE; + pkts = ReadGop(video_index, &min_dts, &start_pts, NULL); + FreeGop(pkts); -/**************************************************************/ -/* audio output */ -void MPEG2trans::init_audioout_stream(void) -{ - AVCodecContext *c; + /* calcuate actual delta used in pts/dts fixup */ + if (next_start_pts == (int64_t)AV_NOPTS_VALUE) + { + /* first section */ + /* minimum dts in first gop should translate to a dts of 0 */ + delta_pts = min_dts; + } + else + { + /* not first section */ + /* minimum pts of video_index should translate to next_start_pts */ + delta_pts = start_pts - next_start_pts; + } + next_start_pts = end_pts; + +#ifdef MPEG2trans_DEBUG + cerr << "Minimum PTS = " << start_pts << endl; + cerr << "Maximum PTS = " << end_pts << endl; + cerr << "I/O Delta = " << delta_pts << endl; +#endif - c = audioout_st->codec; - c->codec_id = (inputContext->streams[audioin_index])->codec->codec_id; - c->codec_type = CODEC_TYPE_AUDIO; + /* seek to start gop */ + av_read_frame_flush(inputFC); + url_fseek(&inputFC->pb, posMap[start_key], SEEK_SET); - /* put sample parameters */ - c->bit_rate = audio_bitrate; - c->sample_rate = audio_freq; - c->channels = 2; - DPRINTF(1, "AUDIO: bitrate: %d freq: %d\n", c->bit_rate, c->sample_rate); -} + /* repeat until pts of all streams are past end_pts */ + bool done; + bool *dones = new bool[inputFC->nb_streams]; + for (int i = 0; i < inputFC->nb_streams; i++) dones[i] = false; -/**************************************************************/ -/* video output */ -void MPEG2trans::init_videoout_stream() -{ - AVCodecContext *c; + do + { + /* read packet */ + ret = av_read_frame(inputFC, &pkt); + if (ret < 0) break; - c = videoout_st->codec; - c->codec_id = (inputContext->streams[videoin_index])->codec->codec_id; - c->codec_type = CODEC_TYPE_VIDEO; + /* end pts is the pts of the last frame in the last gop + the duration of the frame */ + /* ie it is the pts of the first frame in the next gop after the cut point */ + /* if the current frame is to be decoded after end_pts we take this as an indication */ + /* that we are finished with this stream for the currect section */ + if (pkt.dts >= end_pts) dones[pkt.stream_index] = true; - /* put sample parameters */ - c->bit_rate = video_bitrate; - /* resolution must be a multiple of two */ - c->width = video_width; - c->height = video_height; - /* frames per second */ - c->time_base.den = video_frame_rate; - c->time_base.num = 1000; - c->gop_size = 12; /* emit one intra frame every twelve frames at most */ - /* just for testing, we also add B frames */ - c->max_b_frames = 2; - DPRINTF(1, "VIDEO: bitrate: %d size: %dx%d framerate: %f\n", - c->bit_rate, c->width, c->height, video_frame_rate / 1000.0); + /* if the presentation time is between start_pts and end_pts save it in the output */ + if ((pkt.pts != (int64_t)AV_NOPTS_VALUE && pkt.pts >= start_pts && pkt.pts < end_pts) || + (pkt.pts == (int64_t)AV_NOPTS_VALUE && pkt.dts >= min_dts && pkt.dts < end_pts)) + { + if (pkt.stream_index == video_index) completed_frames++; + + if (pkt.pts != (int64_t)AV_NOPTS_VALUE) pkt.pts -= delta_pts; + if (pkt.dts != (int64_t)AV_NOPTS_VALUE) pkt.dts -= delta_pts; + +#ifdef MPEG2trans_DEBUG + cerr << "T: " << pkt.pts << ", " << pkt.dts << endl; +#endif + av_interleaved_write_frame(outputFC, &pkt); + } + else if (pkt.destruct) pkt.destruct(&pkt); + + done = true; + for (int i = 0; i < inputFC->nb_streams; i++) done &= dones[i]; + + int percentage = 100 * completed_frames/total_frames; + if (chkTranscodeDB) + { + if (JobQueue::GetJobCmd(jobID) == JOB_STOP) + { + unlink(tmpfile.ascii()); + /* should probably clean up here */ + VERBOSE(VB_IMPORTANT, "Transcoding STOPped by JobQueue"); + return TRANSCODE_EXIT_STOPPED; + } + JobQueue::ChangeJobComment(jobID, QString("%1% ").arg(percentage) + + QObject::tr("Completed")); + } + else + cerr << "Percent complete: " << percentage << "%\r" << flush; + + } while (!done); + } + else // delete frames + { + // skip frames + dMapIter++; + if (dMapIter == deleteMap.end()) continue; + } + } + + /*============== Close AV ==============*/ + // Close output file + url_fclose(&outputFC->pb); + for (int i = 0; i < outputFC->nb_streams; i++) av_free(outputFC->streams[i]); + av_free(outputFC); + outputFC = NULL; + + // Close input file + av_close_input_file(inputFC); + inputFC = NULL; + + return TRANSCODE_EXIT_OK; } -int MPEG2trans::BuildKeyframeIndex(QString filename, QMap &posMap) +int MPEG2trans::BuildKeyframeIndex(QString &file, QMap &posMap) { - AVPacket pkt1, *pkt = &pkt1; - AVFormatParameters params, *ap = ¶ms; - int i, err; - uint32_t count = 0; + AVPacket pkt; + int video_index = -1; + int count = 0; - inputContext = NULL; //av_mallocz(sizeof(AVFormatContext)); - ap = (AVFormatParameters *)calloc(sizeof(AVFormatParameters), 1); - err = av_open_input_file(&inputContext, filename, NULL, 0, ap); - if (err < 0) - { - VERBOSE(VB_IMPORTANT, QString("Failed to open file '%1', error code %2") - .arg(filename).arg(err)); - return 1; - } - err = av_find_stream_info(inputContext); - if (err < 0) - { - VERBOSE(VB_IMPORTANT, - QString("Could not find stream paramters for '%1'," - " error code %2").arg(filename).arg(err)); - return 2; - } + /*============ initialise AV ===============*/ + if (!InitAV(file)) + return TRANSCODE_EXIT_UNKNOWN_ERROR; - for (i = 0; i < inputContext->nb_streams; i++) + /* find video stream index */ + for (int i = 0; i < inputFC->nb_streams; i++) { - AVCodecContext *enc = inputContext->streams[i]->codec; - if (enc->codec_type == CODEC_TYPE_VIDEO) + if (inputFC->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO) { - videoin_index = i; + video_index = i; break; } } - while (av_read_frame(inputContext, pkt) >= 0) + /* no video stream */ + if (video_index == -1) + return TRANSCODE_BUGGY_EXIT_INVALID_VIDEO; + + av_init_packet(&pkt); + + while (av_read_frame(inputFC, &pkt) >= 0) { - if (pkt->stream_index == videoin_index) + if (pkt.stream_index == video_index) { - if (process_video(pkt, true)) - posMap[count] = pkt->pos; + if (pkt.flags & PKT_FLAG_KEY) + posMap[count] = pkt.pos; count++; } } - av_close_input_file(inputContext); - return 0; + + // Close input file + av_close_input_file(inputFC); + inputFC = NULL; + + return TRANSCODE_EXIT_OK; } Index: programs/mythtranscode/main.cpp =================================================================== --- programs/mythtranscode/main.cpp (revision 6963) +++ programs/mythtranscode/main.cpp (working copy) @@ -389,11 +389,13 @@ if (found_infile) { +#if 0 MPEG2trans *mpeg2trans = new MPEG2trans(&deleteMap); - int err = mpeg2trans->DoTranscode(infile, tmpfile); - if (err || mpeg2trans->BuildKeyframeIndex(tmpfile, posMap)) + bool succ = mpeg2trans->DoTranscode(infile, tmpfile); + if (!succ || !mpeg2trans->BuildKeyframeIndex(tmpfile, posMap)) return TRANSCODE_EXIT_UNKNOWN_ERROR; UpdatePositionMap(posMap, tmpfile + ".map", NULL); +#endif return TRANSCODE_EXIT_OK; } Transcode *transcode = new Transcode(pginfo); @@ -412,25 +414,24 @@ int exitcode = TRANSCODE_EXIT_OK; if (result == REENCODE_MPEG2TRANS) { - if (useCutlist) - pginfo->GetCutList(deleteMap); - MPEG2trans *mpeg2trans = new MPEG2trans(&deleteMap); + MPEG2trans *mpeg2trans = new MPEG2trans(pginfo); if (build_index) { - if (mpeg2trans->BuildKeyframeIndex(infile, posMap)) - return TRANSCODE_EXIT_UNKNOWN_ERROR; + int err = mpeg2trans->BuildKeyframeIndex(infile, posMap); + if (err) + return err; UpdatePositionMap(posMap, NULL, pginfo); } else { - int err = mpeg2trans->DoTranscode(infile, tmpfile); - if (err || mpeg2trans->BuildKeyframeIndex(tmpfile, posMap)) - return TRANSCODE_EXIT_UNKNOWN_ERROR; - UpdatePositionMap(posMap, tmpfile + ".map", NULL); - return TRANSCODE_EXIT_OK; + int err = mpeg2trans->DoTranscode(infile, tmpfile, useCutlist, use_db); + if (err) + return err; + err = mpeg2trans->BuildKeyframeIndex(tmpfile, posMap); + if (err) + return err; + UpdatePositionMap(posMap, NULL, pginfo); } - // this is a hack, since the mpeg2 transcoder doesn't return anything - // useful yet. result = REENCODE_OK; } if (result == REENCODE_OK) Index: programs/mythtranscode/mpeg2trans.h =================================================================== --- programs/mythtranscode/mpeg2trans.h (revision 6963) +++ programs/mythtranscode/mpeg2trans.h (working copy) @@ -1,121 +1,33 @@ -#include -#include -#include -#include "programinfo.h" -#include "exitcodes.h" -#include "mythcontext.h" +#ifndef MPEG2TRANS_H +#define MPEG2TRANS_H -extern "C" { #include "avformat.h" -} -typedef struct { - uint8_t drop; - uint8_t hour; - uint8_t min; - uint8_t sec; - uint8_t pic; -} gop_timestamp_t; +#include "mythcontext.h" +#include "programinfo.h" -class FrameBuffer -{ - public: - FrameBuffer(void) { size = 0; pkt.size = 0; pkt.data = NULL; delta = 0;} - ~FrameBuffer(void) { if (pkt.data) free (pkt.data); } - void setPkt(AVPacket *newpkt, int64_t del = 0); - void setPkt(uint8_t *data, uint32_t newsize, int64_t newpts, int64_t del=0); - AVPacket *getPkt(void) { return &pkt; } - uint8_t *getData(void) { return pkt.data; } - uint32_t getSize(void) { return pkt.size; } - int64_t getPTS(void) { return pkt.pts; } - int64_t getDelta(void) { return delta; } - void Reset(void) { pkt.size = 0; } - private: - AVPacket pkt; - int32_t size; - int64_t delta; -}; - class MPEG2trans { - public: - MPEG2trans(QMap *map); - ~MPEG2trans(void); - int DoTranscode(QString inputFilename, QString outputFilename); - int BuildKeyframeIndex(QString filename, QMap &posMap); - private: - uint32_t parse_seq_header(uint8_t *PES_data, bool store); - uint32_t get_gop_data(uint8_t *PES_data, gop_timestamp_t *gopts, - bool *closed, bool *store); - void set_gop_data(uint8_t *PES_data, gop_timestamp_t *gopts, - bool closed, bool store); - void update_timestamp(gop_timestamp_t *fixed_gopts, gop_timestamp_t *ts); - void update_pic_frame_num(uint8_t *PES_data, int num); - uint32_t get_ext_frame(uint8_t *PES_data); + public: + MPEG2trans(ProgramInfo *pginfo); + ~MPEG2trans(); - void init_audioout_stream(void); - void init_videoout_stream(void); + int DoTranscode(QString &infile, QString &tmpfile, bool useCutlist, bool chkTranscodeDB); + int BuildKeyframeIndex(QString &file, QMap &posMap); - void write_muxed_frame(AVStream *stream, AVPacket *pkt, int advance, int64_t delta = 0); + private: + bool InitAV(QString &inputfile); + bool InitOutput(QString &outfile); - bool check_ac3_header(uint8_t *buf); - bool check_mp2_header(uint8_t *buf); - bool check_video_header(uint8_t *buf); + AVPacketList *ReadGop(int index, int64_t *min_dts, int64_t *min_pts, int64_t *end_pts); + void FreeGop(AVPacketList *pkts); + void FlushGop(AVPacketList *pkts, int64_t delta, int64_t start, int64_t end); - uint32_t process_ac3_audio(AVPacket *pkt); - uint32_t process_mp2_audio(AVPacket *pkt); - void process_audio(AVPacket *pkt); - bool process_video(AVPacket *pkt, bool gopsearch = false); + ProgramInfo *m_pginfo; - int video_width; - int video_height; - int video_aspect; - uint32_t video_frame_rate; - uint32_t video_bitrate; - int pic_frame_count; - - bool use_ac3; - uint32_t audio_freq; - uint32_t audio_bitrate; - - int64_t goppts_delta; - - gop_timestamp_t *fixed_gop_ts; - - bool chopping; - bool chop_end; - int skipped_frames; - - bool got_audio; - bool got_video; - bool init_av; - - AVFormatContext *outputContext; - AVFormatContext *inputContext; - - AVStream *audioout_st; - AVStream *videoout_st; - - int audioin_index; - int videoin_index; - - uint32_t last_frame_number; - int64_t last_gop_pts; - int64_t chop_start_pts; - uint8_t video_frame_state; - - FrameBuffer audioFrame; - FrameBuffer videoFrame; - FrameBuffer seqFrame; - - QMap cutlistMap; - QMap::Iterator cutlistIter; - - QPtrQueue audioQueue; - QPtrQueue videoQueue; - QPtrStack audioPool; - QPtrStack videoPool; - - QPtrQueue audskipQueue; + AVFormatContext *inputFC; + AVFormatContext *outputFC; }; + +#endif