bug fix audio codec

zhangmeng

2019-09-26 1f005df2f3ff78458f332f9bf1cf2e78b6a8e8e4

 csrc/ffmpeg/format/FormatOut.cpp

@@ -275,11 +275,12 @@
        return true;
    }

    bool FormatOut::copyCodecFromIn(AVFormatContext* in){
    bool FormatOut::copyCodecFromIn(std::vector<AVStream*> in){

        for(int i = 0; i < in->nb_streams; i++)
        {    //根据输入流创建输出流
            AVStream *in_stream = in->streams[i];
        for (int i = 0; i < in.size(); i++){

            AVStream *in_stream = in[i];
            
            AVStream *out_stream = avformat_new_stream(ctx_, in_stream->codec->codec);
            if(!out_stream)
            {
@@ -297,23 +298,31 @@

            if (in_stream->codecpar->codec_type == AVMEDIA_TYPE_VIDEO){
                v_idx_ = i;
            }else{
                a_idx_ = i;
            }
                logIt("copy video from instream");

            out_stream->codecpar->codec_tag = out_stream->codec->codec_tag = 0;
                out_stream->codecpar->codec_tag = out_stream->codec->codec_tag = 0;
            
            if(ctx_->oformat->flags & AVFMT_GLOBALHEADER)
                out_stream->codec->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
                if(ctx_->oformat->flags & AVFMT_GLOBALHEADER)
                    out_stream->codec->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
            }
            if (in_stream->codecpar->codec_type == AVMEDIA_TYPE_AUDIO){
                logIt("copy audio from instream");
                a_idx_ = i;
                
                out_stream->codecpar->codec_tag = out_stream->codec->codec_tag = 0;
            
                if(ctx_->oformat->flags & AVFMT_GLOBALHEADER)
                    out_stream->codec->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;

            }
        }

        in_ctx_ = in;
        in_streams_ = in;

        return true;
    }

    bool FormatOut::JustWriter(AVFormatContext *in, const char *filename){
    bool FormatOut::JustWriter(std::vector<AVStream*> in, const char *filename){
        if(ctx_){
            clear();
        }
@@ -335,7 +344,6 @@
            av_dict_set(&avdic,option_key,option_value,0);
            flag = writeHeader(&avdic);
            av_dict_free(&avdic);

        }
        
        return flag;
@@ -387,15 +395,51 @@
            logIt("adjustPTS pkt stream index too much");
            return;
        }
        
        if (pkt->pts == AV_NOPTS_VALUE && pkt->pts == AV_NOPTS_VALUE){
            int64_t time_stamp = frame_cnt;
        
            pkt->pos = -1;  
            pkt->stream_index = 0;
            //Write PTS
            AVRational time_base = getStream()->time_base;

            AVRational time_base_q = { 1, AV_TIME_BASE };
            //Duration between 2 frames (us)
            // int64_t calc_duration = (double)(AV_TIME_BASE)*(1 / fps_);  //内部时间戳
            int64_t calc_duration = (int64_t)(AV_TIME_BASE / fps_);  //内部时间戳
            //Parameters
            pkt->pts = av_rescale_q(time_stamp*calc_duration, time_base_q, time_base);
            pkt->dts = pkt->pts;
            pkt->duration = av_rescale_q(calc_duration, time_base_q, time_base); 
            return;
        }

        AVStream *in_stream,*out_stream;
        int out_idx = -1;
        for (auto i : in_streams_){
            if (i->index == pkt->stream_index){
                if (i->codecpar->codec_type == AVMEDIA_TYPE_VIDEO){
                    out_idx = v_idx_;
                    in_stream = i;
                    break;
                }else if (i->codecpar->codec_type == AVMEDIA_TYPE_AUDIO){
                    in_stream = i;
                    out_idx = a_idx_;
                    break;
                }
            }
        }
        if (out_idx == -1) return;

        out_stream = ctx_->streams[out_idx];
        pkt->stream_index = out_idx;
        
        in_stream = in_ctx_->streams[pkt->stream_index];
        out_stream = ctx_->streams[pkt->stream_index];
        
        // if (type == "audio")
        // logIt("BEFORE stream %d type: %s, pts: %lld, dts: %lld, duration: %lld", 
        // pkt.stream_index, type.c_str(), pkt.pts, pkt.pts, pkt.duration);
        // logIt("BEFORE in stream timebase %d:%d, out timebase %d:%d, 
        //         pts: %lld, dts: %lld, duration: %lld", 
        //     in_stream->time_base.num, in_stream->time_base.den,
        //     out_stream->time_base.num, out_stream->time_base.den,
        //     pkt->pts, pkt->dts, pkt->duration);

        //转换 PTS/DTS 时序
        pkt->pts = av_rescale_q_rnd(pkt->pts,in_stream->time_base,out_stream->time_base,(enum AVRounding)(AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX));
@@ -403,10 +447,8 @@
        pkt->duration = av_rescale_q(pkt->duration, in_stream->time_base, out_stream->time_base); 
        pkt->pos = -1;  

        // if (type == "audio")
        // logIt("AFTER stream %d type: %s, pts: %lld, dts: %lld, duration: %lld", 
        // pkt.stream_index, type.c_str(), pkt.pts, pkt.pts, pkt.duration);
                
        // logIt("AFTER stream %d, pts: %lld, dts: %lld, duration: %lld", 
        // pkt->stream_index, pkt->pts, pkt->dts, pkt->duration);
    }

    bool FormatOut::writeFrame(AVPacket *pkt, const int64_t &frame_cnt,