h264 cuvid av bsf and rec

zhangmeng

2020-10-22 65eb475b323b3b9c28761b4e3009ab3d269963e1

 csrc/ffmpeg/format/FormatIn.cpp

@@ -13,7 +13,6 @@
#include <libavutil/avassert.h>
#include <libavutil/imgutils.h>
#include <libswscale/swscale.h>
#include <libavutil/intreadwrite.h>
}

#include "../log/log.hpp"
@@ -38,8 +37,6 @@
   ,read_io_buff_size_(32768)
   ,handle_gb28181(NULL)
   ,fps_(25.0)
    ,bsf_h264(NULL)
    ,bsf_hevc(NULL)
   {}

   FormatIn::FormatIn(const VideoProp &prop, bool hw/*=true*/)
@@ -54,8 +51,6 @@
   ,read_io_buff_size_(32768)
   ,handle_gb28181(NULL)
   ,fps_(25.0)
    ,bsf_h264(NULL)
    ,bsf_hevc(NULL)
   {
      prop_ = new VideoProp;
      *prop_ = prop;
@@ -87,8 +82,6 @@
         io_ctx_ = NULL;
      }

        if (bsf_h264) av_bsf_free(&bsf_h264);
        if (bsf_hevc) av_bsf_free(&bsf_hevc);
   }

////////////////////////////////////////////////////////////////////////
@@ -190,18 +183,7 @@
               }
            logIt("in stream video fps %f, time_base: %d : %d, size: %dx%d", fps_, in->time_base.num, in->time_base.den, in->codecpar->width, in->codecpar->height);

            if (IsHEVC()){

            }else if (isAVC1()) {
               const AVBitStreamFilter *f = av_bsf_get_by_name("h264_mp4toannexb");
                    if (f){
                        if (av_bsf_alloc(f, &bsf_h264) >= 0){
                            if (avcodec_parameters_copy(bsf_h264->par_in, in->codecpar) >= 0){
                                if (av_bsf_init(bsf_h264) < 0) bsf_h264 = NULL;
                            }
                        }
                    }
                }
         }
         if (type == AVMEDIA_TYPE_AUDIO){
            auto in = ctx_->streams[i];
@@ -220,7 +202,7 @@
      return ctx_->streams[vs_idx_]->codecpar->codec_id == AV_CODEC_ID_HEVC;
   }

   const bool FormatIn::isAVC1()const{
   const bool FormatIn::IsAVC1()const{
      if (IsHEVC()) return false;

      char p[100] = {0};
@@ -377,40 +359,6 @@
   int FormatIn::readPacket(AVPacket *pkt_out){

      auto flag = av_read_frame(ctx_, pkt_out);
      if (flag < 0) return flag;

      AVBSFContext *bsf = NULL;

      if (IsHEVC()){
         if (pkt_out->size >= 5 &&
            AV_RB32(pkt_out->data) != 0x0000001 &&
                AV_RB24(pkt_out->data) != 0x000001 &&
                !bsf_hevc){

            const AVBitStreamFilter *f = av_bsf_get_by_name("hevc_mp4toannexb");
                if (f){
                   if (av_bsf_alloc(f, &bsf_hevc) >= 0){
                       if (avcodec_parameters_copy(bsf_hevc->par_in, ctx_->streams[vs_idx_]->codecpar) >= 0){
                           if (av_bsf_init(bsf_hevc) < 0) bsf_hevc = NULL;
                       }
                   }
                }
            }

            bsf = bsf_hevc;

      }else {
         bsf = bsf_h264;
      }
		
      if (bsf){
         if (av_bsf_send_packet(bsf, pkt_out) < 0){
                logIt("bsf_%s send packet failed", IsHEVC() ? "hevc" : "h264");
                return -1;
            }
            return av_bsf_receive_packet(bsf, pkt_out);
      }

      return flag;
   }

@@ -421,7 +369,7 @@
      av_packet_rescale_ts(pkt, in->time_base, in->codec->time_base);
        int ret = avcodec_send_packet(dec_ctx_, pkt);
        if(ret < 0){
           logIt("avcodec_send_packet error : %s", getAVErrorDesc(ret).c_str());
           logIt("pkt size %d avcodec_send_packet error : %s", pkt->size, getAVErrorDesc(ret).c_str());
           return -1;
        }
        while (ret >= 0) {