diff options
| -rw-r--r-- | decoder.cpp | 638 | ||||
| -rw-r--r-- | decoder.h | 80 | ||||
| -rw-r--r-- | markad-standalone.cpp | 8 | ||||
| -rw-r--r-- | recv.cpp | 12 |
4 files changed, 710 insertions, 28 deletions
diff --git a/decoder.cpp b/decoder.cpp index 56192c1..1f1cc0c 100644 --- a/decoder.cpp +++ b/decoder.cpp @@ -91,17 +91,525 @@ unsigned AcMod: } -void cMarkAdDecoder::FindH264VideoInfos(MarkAdContext *maContext, uchar *pespkt, int peslen) +void cMarkAdDecoder::FindVideoInfos(MarkAdContext *maContext, uchar *pkt, int len) { - if ((!maContext) || (!pespkt) || (!peslen)) return; + if ((!maContext) || (!pkt) || (!len)) return; -// TODO: here i need some help from someone who is able to parse an H264 Picture -// Parameter Set (ID 0x68 or 0x28) or an H264 Sequence Parameter Set (ID 0x67 or 0x27) + if (maContext->General.H264) + { + FindH264VideoInfos(maContext, pkt, len); + } + else + { + FindH262VideoInfos(maContext, pkt, len); + } +} + +void cMarkAdDecoder::FindH264VideoInfos(MarkAdContext *maContext, uchar *pkt, int len) +{ + if ((!maContext) || (!pkt) || (!len)) return; + + if ((pkt[3] & 0x1F)==NAL_AUD) + { + switch (pkt[4] >> 5) + { + case 0: + case 3: + case 5: // I_FRAME + maContext->Video.Info.Pict_Type=MA_I_TYPE; + break; + case 1: + case 4: + case 6: // P_FRAME; + maContext->Video.Info.Pict_Type=MA_P_TYPE; + break; + case 2: + case 7: // B_FRAME; + maContext->Video.Info.Pict_Type=MA_B_TYPE; + break; + default: // NO_PICTURE; + maContext->Video.Info.Pict_Type=0; + break; + } + } + + if ((pkt[3] & 0x1F)==NAL_SPS) + { + uint8_t nal_data[len]; + const uint8_t *end = pkt + len; + int nal_len = nalUnescape(nal_data, pkt + 4, int(end - pkt - 4)); + + int profile_idc, level_idc, constraint_set3_flag, pic_order_cnt_type, i, j; + cBitStream bs(nal_data, nal_len); + + uint32_t width=0; + uint32_t height=0; + uint32_t aspect_ratio_idc=0; + uint32_t video_format=0; + double frame_rate=0; + double bit_rate=0; + bool cpb_dpb_delays_present_flag=false; + bool pic_struct_present_flag=false; + bool frame_mbs_only_flag=false; + bool mb_adaptive_frame_field_flag=false; + uint32_t time_offset_length=0; + + profile_idc = bs.getU8(); // profile_idc + bs.skipBit(); // constraint_set0_flag + bs.skipBit(); // constraint_set1_flag + bs.skipBit(); // constraint_set2_flag + constraint_set3_flag = bs.getBit(); // constraint_set3_flag + bs.skipBits(4); // reserved_zero_4bits + level_idc = bs.getU8(); // level_idc + bs.skipUeGolomb(); // seq_parameter_set_id + + switch (profile_idc) + { + case 66: // baseline profile + case 77: // main profile + case 88: // extended profile + switch (level_idc) + { + case 10: // level 1.0 + bit_rate = 64000; + break; + case 11: // level 1b / 1.1 + bit_rate = constraint_set3_flag ? 128000 : 192000; + break; + case 12: // level 1.2 + bit_rate = 384000; + break; + case 13: // level 1.3 + bit_rate = 768000; + break; + case 20: // level 2.0 + bit_rate = 2000000; + break; + case 21: // level 2.1 + bit_rate = 4000000; + break; + case 22: // level 2.2 + bit_rate = 4000000; + break; + case 30: // level 3.0 + bit_rate = 10000000; + break; + case 31: // level 3.1 + bit_rate = 14000000; + break; + case 32: // level 3.2 + bit_rate = 20000000; + break; + case 40: // level 4.0 + bit_rate = 20000000; + break; + case 41: // level 4.1 + bit_rate = 50000000; + break; + case 42: // level 4.2 + bit_rate = 50000000; + break; + case 50: // level 5.0 + bit_rate = 135000000; + break; + case 51: // level 5.1 + bit_rate = 240000000; + break; + default: + break; + } + break; + case 100: // high profile + switch (level_idc) + { + case 10: // level 1.0 + bit_rate = 80000; + break; + case 11: // level 1b / 1.1 + bit_rate = constraint_set3_flag ? 160000 : 240000; + break; + case 12: // level 1.2 + bit_rate = 480000; + break; + case 13: // level 1.3 + bit_rate = 960000; + break; + case 20: // level 2.0 + bit_rate = 2500000; + break; + case 21: // level 2.1 + bit_rate = 5000000; + break; + case 22: // level 2.2 + bit_rate = 5000000; + break; + case 30: // level 3.0 + bit_rate = 12500000; + break; + case 31: // level 3.1 + bit_rate = 17500000; + break; + case 32: // level 3.2 + bit_rate = 25000000; + break; + case 40: // level 4.0 + bit_rate = 25000000; + break; + case 41: // level 4.1 + bit_rate = 62500000; + break; + case 42: // level 4.2 + bit_rate = 62500000; + break; + case 50: // level 5.0 + bit_rate = 168750000; + break; + case 51: // level 5.1 + bit_rate = 300000000; + break; + default: + break; + } + break; + case 110: // high 10 profile + switch (level_idc) + { + case 10: // level 1.0 + bit_rate = 192000; + break; + case 11: // level 1b / 1.1 + bit_rate = constraint_set3_flag ? 384000 : 576000; + break; + case 12: // level 1.2 + bit_rate = 115200; + break; + case 13: // level 1.3 + bit_rate = 2304000; + break; + case 20: // level 2.0 + bit_rate = 6000000; + break; + case 21: // level 2.1 + bit_rate = 12000000; + break; + case 22: // level 2.2 + bit_rate = 12000000; + break; + case 30: // level 3.0 + bit_rate = 30000000; + break; + case 31: // level 3.1 + bit_rate = 42000000; + break; + case 32: // level 3.2 + bit_rate = 60000000; + break; + case 40: // level 4.0 + bit_rate = 60000000; + break; + case 41: // level 4.1 + bit_rate = 150000000; + break; + case 42: // level 4.2 + bit_rate = 150000000; + break; + case 50: // level 5.0 + bit_rate = 405000000; + break; + case 51: // level 5.1 + bit_rate = 720000000; + break; + default: + break; + } + break; + case 122: // high 4:2:2 profile + case 144: // high 4:4:4 profile + switch (level_idc) + { + case 10: // level 1.0 + bit_rate = 256000; + break; + case 11: // level 1b / 1.1 + bit_rate = constraint_set3_flag ? 512000 : 768000; + break; + case 12: // level 1.2 + bit_rate = 1536000; + break; + case 13: // level 1.3 + bit_rate = 3072000; + break; + case 20: // level 2.0 + bit_rate = 8000000; + break; + case 21: // level 2.1 + bit_rate = 16000000; + break; + case 22: // level 2.2 + bit_rate = 16000000; + break; + case 30: // level 3.0 + bit_rate = 40000000; + break; + case 31: // level 3.1 + bit_rate = 56000000; + break; + case 32: // level 3.2 + bit_rate = 80000000; + break; + case 40: // level 4.0 + bit_rate = 80000000; + break; + case 41: // level 4.1 + bit_rate = 200000000; + break; + case 42: // level 4.2 + bit_rate = 200000000; + break; + case 50: // level 5.0 + bit_rate = 540000000; + break; + case 51: // level 5.1 + bit_rate = 960000000; + break; + default: + break; + } + break; + default: + break; + } + if ((profile_idc == 100) || (profile_idc == 110) || (profile_idc == 122) || (profile_idc == 144)) + { + if (bs.getUeGolomb() == 3) // chroma_format_idc + bs.skipBit(); // residual_colour_transform_flag + bs.skipUeGolomb(); // bit_depth_luma_minus8 + bs.skipUeGolomb(); // bit_depth_chroma_minus8 + bs.skipBit(); // qpprime_y_zero_transform_bypass_flag + if (bs.getBit()) // seq_scaling_matrix_present_flag + { + for (i = 0; i < 8; ++i) + { + if (bs.getBit()) // seq_scaling_list_present_flag[i] + { + int last = 8, next = 8, size = (i < 6) ? 16 : 64; + for (j = 0; j < size; ++j) + { + if (next) + next = (last + bs.getSeGolomb()) & 0xff; + last = next ?: last; + } + } + } + } + } + bs.skipUeGolomb(); // log2_max_frame_num_minus4 + pic_order_cnt_type = bs.getUeGolomb(); // pic_order_cnt_type + if (pic_order_cnt_type == 0) + bs.skipUeGolomb(); // log2_max_pic_order_cnt_lsb_minus4 + else if (pic_order_cnt_type == 1) + { + bs.skipBit(); // delta_pic_order_always_zero + bs.skipSeGolomb(); // offset_for_non_ref_pic + bs.skipSeGolomb(); // offset_for_top_to_bottom_field + j = bs.getUeGolomb(); // num_ref_frames_in_pic_order_cnt_cycle + for (i = 0; i < j; ++i) + bs.skipSeGolomb(); // offset_for_ref_frame[i] + } + bs.skipUeGolomb(); // num_ref_frames + bs.skipBit(); // gaps_in_frame_num_value_allowed_flag + width = bs.getUeGolomb() + 1; // pic_width_in_mbs_minus1 + height = bs.getUeGolomb() + 1; // pic_height_in_mbs_minus1 + frame_mbs_only_flag = bs.getBit(); // frame_mbs_only_flag + width *= 16; + height *= 16 * (frame_mbs_only_flag ? 1 : 2); + if (!frame_mbs_only_flag) + mb_adaptive_frame_field_flag = bs.getBit(); // mb_adaptive_frame_field_flag + bs.skipBit(); // direct_8x8_inference_flag + if (bs.getBit()) // frame_cropping_flag + { + uint32_t crop_left, crop_right, crop_top, crop_bottom; + crop_left = bs.getUeGolomb(); // frame_crop_left_offset + crop_right = bs.getUeGolomb(); // frame_crop_rigth_offset + crop_top = bs.getUeGolomb(); // frame_crop_top_offset + crop_bottom = bs.getUeGolomb(); // frame_crop_bottom_offset + width -= 2 * (crop_left + crop_right); + if (frame_mbs_only_flag) + height -= 2 * (crop_top + crop_bottom); + else + height -= 4 * (crop_top + crop_bottom); + } + // VUI parameters + if (bs.getBit()) // vui_parameters_present_flag + { + if (bs.getBit()) // aspect_ratio_info_present + { + aspect_ratio_idc = bs.getU8(); // aspect_ratio_idc + if (aspect_ratio_idc == 255) // extended sar + { + bs.skipBits(16); // sar_width + bs.skipBits(16); // sar_height + } + } + if (bs.getBit()) // overscan_info_present_flag + bs.skipBit(); // overscan_approriate_flag + if (bs.getBit()) // video_signal_type_present_flag + { + video_format = bs.getBits(3); // video_format + bs.skipBit(); // video_full_range_flag + if (bs.getBit()) // colour_description_present_flag + { + bs.skipBits(8); // colour_primaries + bs.skipBits(8); // transfer_characteristics + bs.skipBits(8); // matrix_coefficients + } + } + if (bs.getBit()) // chroma_loc_info_present_flag + { + bs.skipUeGolomb(); // chroma_sample_loc_type_top_field + bs.skipUeGolomb(); // chroma_sample_loc_type_bottom_field + } + if (bs.getBit()) // timing_info_present_flag + { + uint32_t num_units_in_tick, time_scale; + num_units_in_tick = bs.getU32(); // num_units_in_tick + time_scale = bs.getU32(); // time_scale + if (num_units_in_tick > 0) + frame_rate = time_scale / num_units_in_tick; + bs.skipBit(); // fixed_frame_rate_flag + } + int nal_hrd_parameters_present_flag = bs.getBit(); // nal_hrd_parameters_present_flag + if (nal_hrd_parameters_present_flag) + { + int cpb_cnt_minus1; + cpb_cnt_minus1 = bs.getUeGolomb(); // cpb_cnt_minus1 + bs.skipBits(4); // bit_rate_scale + bs.skipBits(4); // cpb_size_scale + for (int i = 0; i < cpb_cnt_minus1; ++i) + { + bs.skipUeGolomb(); // bit_rate_value_minus1[i] + bs.skipUeGolomb(); // cpb_size_value_minus1[i] + bs.skipBit(); // cbr_flag[i] + } + bs.skipBits(5); // initial_cpb_removal_delay_length_minus1 + bs.skipBits(5); // cpb_removal_delay_length_minus1 + bs.skipBits(5); // dpb_output_delay_length_minus1 + time_offset_length = bs.getBits(5); // time_offset_length + } + int vlc_hrd_parameters_present_flag = bs.getBit(); // vlc_hrd_parameters_present_flag + if (vlc_hrd_parameters_present_flag) + { + int cpb_cnt_minus1; + cpb_cnt_minus1 = bs.getUeGolomb(); // cpb_cnt_minus1 + bs.skipBits(4); // bit_rate_scale + bs.skipBits(4); // cpb_size_scale + for (int i = 0; i < cpb_cnt_minus1; ++i) + { + bs.skipUeGolomb(); // bit_rate_value_minus1[i] + bs.skipUeGolomb(); // cpb_size_value_minus1[i] + bs.skipBit(); // cbr_flag[i] + } + bs.skipBits(5); // initial_cpb_removal_delay_length_minus1 + bs.skipBits(5); // cpb_removal_delay_length_minus1 + bs.skipBits(5); // dpb_output_delay_length_minus1 + time_offset_length = bs.getBits(5);// time_offset_length + } + cpb_dpb_delays_present_flag = (nal_hrd_parameters_present_flag | vlc_hrd_parameters_present_flag); + if (cpb_dpb_delays_present_flag) + bs.skipBit(); // low_delay_hrd_flag + pic_struct_present_flag = bs.getBit(); // pic_struct_present_flag + if (bs.getBit()) // bitstream_restriction_flag + { + bs.skipBit(); // motion_vectors_over_pic_boundaries_flag + bs.skipUeGolomb(); // max_bytes_per_pic_denom + bs.skipUeGolomb(); // max_bits_per_mb_denom + bs.skipUeGolomb(); // log2_max_mv_length_horizontal + bs.skipUeGolomb(); // log2_max_mv_length_vertical + bs.skipUeGolomb(); // num_reorder_frames + bs.skipUeGolomb(); // max_dec_frame_buffering + } + } + + if ((bs.getIndex() / 8)>0) + { + // set values + maContext->Video.Info.Width=width; + maContext->Video.Info.Height=height; + + switch (aspect_ratio_idc) + { + case 1: + maContext->Video.Info.AspectRatio.Num=1; + maContext->Video.Info.AspectRatio.Den=1; + break; + case 2: + maContext->Video.Info.AspectRatio.Num=12; + maContext->Video.Info.AspectRatio.Den=31; + break; + case 3: + maContext->Video.Info.AspectRatio.Num=10; + maContext->Video.Info.AspectRatio.Den=11; + break; + case 4: + maContext->Video.Info.AspectRatio.Num=16; + maContext->Video.Info.AspectRatio.Den=11; + break; + case 5: + maContext->Video.Info.AspectRatio.Num=40; + maContext->Video.Info.AspectRatio.Den=33; + break; + case 6: + maContext->Video.Info.AspectRatio.Num=24; + maContext->Video.Info.AspectRatio.Den=11; + break; + case 7: + maContext->Video.Info.AspectRatio.Num=20; + maContext->Video.Info.AspectRatio.Den=11; + break; + case 8: + maContext->Video.Info.AspectRatio.Num=32; + maContext->Video.Info.AspectRatio.Den=11; + break; + case 9: + maContext->Video.Info.AspectRatio.Num=80; + maContext->Video.Info.AspectRatio.Den=33; + break; + case 10: + maContext->Video.Info.AspectRatio.Num=18; + maContext->Video.Info.AspectRatio.Den=11; + break; + case 11: + maContext->Video.Info.AspectRatio.Num=15; + maContext->Video.Info.AspectRatio.Den=11; + break; + case 12: + maContext->Video.Info.AspectRatio.Num=64; + maContext->Video.Info.AspectRatio.Den=33; + break; + case 13: + maContext->Video.Info.AspectRatio.Num=160; + maContext->Video.Info.AspectRatio.Den=99; + break; + case 14: + maContext->Video.Info.AspectRatio.Num=4; + maContext->Video.Info.AspectRatio.Den=3; + break; + case 15: + maContext->Video.Info.AspectRatio.Num=3; + maContext->Video.Info.AspectRatio.Den=2; + break; + case 16: + maContext->Video.Info.AspectRatio.Num=2; + maContext->Video.Info.AspectRatio.Den=1; + break; + } + } + } } -void cMarkAdDecoder::FindH262VideoInfos(MarkAdContext *maContext, uchar *pespkt, int peslen) +void cMarkAdDecoder::FindH262VideoInfos(MarkAdContext *maContext, uchar *pkt, int len) { - if ((!maContext) || (!pespkt) || (!peslen)) return; + if ((!maContext) || (!pkt) || (!len)) return; struct H262_SequenceHdr { @@ -147,8 +655,8 @@ unsigned TemporalReferenceL: 8; }; - struct H262_SequenceHdr *seqhdr = (struct H262_SequenceHdr *) pespkt; - struct H262_PictureHdr *pichdr = (struct H262_PictureHdr *) pespkt; + struct H262_SequenceHdr *seqhdr = (struct H262_SequenceHdr *) pkt; + struct H262_PictureHdr *pichdr = (struct H262_PictureHdr *) pkt; if (pichdr->Sync1==0 && pichdr->Sync2==0 && pichdr->Sync3==1 && pichdr->Sync4==0) { @@ -537,7 +1045,7 @@ bool cMarkAdDecoder::SetVideoInfos(MarkAdContext *maContext,AVCodecContext *Vide } #endif -bool cMarkAdDecoder::DecodeVideo(MarkAdContext *maContext,uchar *pespkt, int peslen) +bool cMarkAdDecoder::DecodeVideo(MarkAdContext *maContext,uchar *pkt, int len) { #ifdef HAVE_AVCODEC AVPacket avpkt; @@ -548,8 +1056,8 @@ bool cMarkAdDecoder::DecodeVideo(MarkAdContext *maContext,uchar *pespkt, int pes avpkt.pts = avpkt.dts = AV_NOPTS_VALUE; avpkt.pos = -1; #endif - avpkt.data=pespkt; - avpkt.size=peslen; + avpkt.data=pkt; + avpkt.size=len; // decode video int video_frame_ready=0; @@ -585,3 +1093,111 @@ bool cMarkAdDecoder::DecodeVideo(MarkAdContext *maContext,uchar *pespkt, int pes return true; #endif } + +// taken from femon +int cMarkAdDecoder::nalUnescape(uint8_t *dst, const uint8_t *src, int len) +{ + int s = 0, d = 0; + + while (s < len) + { + if (!src[s] && !src[s + 1]) + { + // hit 00 00 xx + dst[d] = dst[d + 1] = 0; + s += 2; + d += 2; + if (src[s] == 3) + { + s++; // 00 00 03 xx --> 00 00 xx + if (s >= len) + return d; + } + } + dst[d++] = src[s++]; + } + + return d; +} + +cBitStream::cBitStream(const uint8_t *buf, const int len) + : data(buf), + count(len), + index(0) +{ +} + +cBitStream::~cBitStream() +{ +} + +int cBitStream::getBit() +{ + if (index >= count) + return (1); // -> no infinite colomb's ... + + int r = (data[index >> 3] >> (7 - (index & 7))) & 1; + ++index; + + return (r); +} + +uint32_t cBitStream::getBits(uint32_t n) +{ + uint32_t r = 0; + + while (n--) + r = (r | (getBit() << n)); + + return (r); +} + +void cBitStream::skipBits(uint32_t n) +{ + index += n; +} + +uint32_t cBitStream::getUeGolomb() +{ + int n = 0; + + while (!getBit() && (n < 32)) + n++; + + return (n ? ((1 << n) - 1) + getBits(n) : 0); +} + +int32_t cBitStream::getSeGolomb() +{ + uint32_t r = getUeGolomb() + 1; + + return ((r & 1) ? -(r >> 1) : (r >> 1)); +} + +void cBitStream::skipGolomb() +{ + int n = 0; + + while (!getBit() && (n < 32)) + n++; + + skipBits(n); +} + +void cBitStream::skipUeGolomb() +{ + skipGolomb(); +} + +void cBitStream::skipSeGolomb() +{ + skipGolomb(); +} + +void cBitStream::byteAlign() +{ + int n = index % 8; + + if (n > 0) + skipBits(8 - n); +} @@ -57,15 +57,87 @@ private: bool SetVideoInfos(MarkAdContext *maContext,AVCodecContext *Video_Context, AVFrame *Video_Frame, AVRational *DAR); #endif + // taken from femon + enum + { + NAL_SEI = 0x06, // Supplemental Enhancement Information + NAL_SPS = 0x07, // Sequence Parameter Set + NAL_AUD = 0x09, // Access Unit Delimiter + NAL_END_SEQ = 0x0A // End of Sequence + }; + int nalUnescape(uint8_t *dst, const uint8_t *src, int len); + + void FindH264VideoInfos(MarkAdContext *maContext, uchar *pkt, int len); + void FindH262VideoInfos(MarkAdContext *maContext, uchar *pkt, int len); public: - void FindAC3AudioInfos(MarkAdContext *maContext, uchar *espkt, int eslen); - void FindH264VideoInfos(MarkAdContext *maContext, uchar *pespkt, int peslen); - void FindH262VideoInfos(MarkAdContext *maContext, uchar *pespkt, int peslen); - bool DecodeVideo(MarkAdContext *maContext, uchar *pespkt, int peslen); + void FindVideoInfos(MarkAdContext *maContext, uchar *pkt, int len); + bool DecodeVideo(MarkAdContext *maContext, uchar *pkt, int len); bool DecodeMP2(MarkAdContext *maContext, uchar *espkt, int eslen); + void FindAC3AudioInfos(MarkAdContext *maContext, uchar *espkt, int eslen); bool DecodeAC3(MarkAdContext *maContext, uchar *espkt, int eslen); cMarkAdDecoder(int recvnumber, bool useH264, bool hasAC3); ~cMarkAdDecoder(); }; +// taken from femon +class cBitStream +{ +private: + const uint8_t *data; + int count; // in bits + int index; // in bits + +public: + cBitStream(const uint8_t *buf, const int len); + ~cBitStream(); + + int getBit(); + uint32_t getBits(uint32_t n); + void skipBits(uint32_t n); + uint32_t getUeGolomb(); + int32_t getSeGolomb(); + void skipGolomb(); + void skipUeGolomb(); + void skipSeGolomb(); + void byteAlign(); + + void skipBit() + { + skipBits(1); + } + uint32_t getU8() + { + return getBits(8); + } + uint32_t getU16() + { + return ((getBits(8) << 8) | getBits(8)); + } + uint32_t getU24() + { + return ((getBits(8) << 16) | (getBits(8) << 8) | getBits(8)); + } + uint32_t getU32() + { + return ((getBits(8) << 24) | (getBits(8) << 16) | (getBits(8) << 8) | getBits(8)); + } + bool isEOF() + { + return (index >= count); + } + void reset() + { + index = 0; + } + int getIndex() + { + return (isEOF() ? count : index); + } + const uint8_t *getData() + { + return (isEOF() ? NULL : data + (index / 8)); + } +}; + + #endif diff --git a/markad-standalone.cpp b/markad-standalone.cpp index 7bd293e..18ab1a0 100644 --- a/markad-standalone.cpp +++ b/markad-standalone.cpp @@ -182,7 +182,7 @@ bool cMarkAdStandalone::ProcessFile(int Number) { if (pkt) { - decoder->FindH262VideoInfos(&macontext,pkt,pktlen); + decoder->FindVideoInfos(&macontext,pkt,pktlen); if (decoder->DecodeVideo(&macontext,pkt,pktlen)) { mark=video->Process(lastiframe); @@ -306,15 +306,17 @@ cMarkAdStandalone::cMarkAdStandalone(const char *Directory) if (index->isTS()) { macontext.General.VPid.Type=MARKAD_PIDTYPE_VIDEO_H264; + macontext.General.H264=true; } else { macontext.General.VPid.Type=MARKAD_PIDTYPE_VIDEO_H262; + macontext.General.H264=false; } - macontext.General.VPid.Num=0xa5; + macontext.General.VPid.Num=0x3ff; //macontext.General.DPid.Num=0x403; - macontext.General.APid.Num=0x78; + //macontext.General.APid.Num=0; video_demux = new cMarkAdDemux(255); @@ -64,7 +64,7 @@ cMarkAdReceiver::cMarkAdReceiver(int RecvNumber, const char *Filename, cTimer *T if (macontext.General.VPid.Num) { - dsyslog("markad [%i]: using %s-video",recvnumber,useH264 ? "H262": "H264"); + dsyslog("markad [%i]: using %s-video",recvnumber,useH264 ? "H264": "H262"); video=new cMarkAdVideo(RecvNumber,&macontext); video_demux = new cMarkAdDemux(RecvNumber); } @@ -249,14 +249,6 @@ void cMarkAdReceiver::Action() uchar *tspkt = frame->Data(); int tslen = frame->Count(); -#if 0 -int w=open("/tmp/test.ts",O_CREAT|O_RDWR|O_APPEND,0644); -if (w!=-1) { -write(w,tspkt,tslen); -close(w); -} -#endif - while (tslen>0) { int len=video_demux->Process(macontext.General.VPid,tspkt,tslen,&pkt,&pktlen); @@ -268,7 +260,7 @@ close(w); { if (pkt) { - decoder->FindH262VideoInfos(&macontext,pkt,pktlen); + decoder->FindVideoInfos(&macontext,pkt,pktlen); if (decoder->DecodeVideo(&macontext,pkt,pktlen)) { mark=video->Process(lastiframe); |