scrap: add hw quality control

Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages
2022-06-01 18:40:28 +08:00
parent 399ddc8bef
commit 7e6c38e6d2
5 changed files with 97 additions and 20 deletions

View File

@@ -11,7 +11,7 @@ use crate::vpxcodec::*;
use hbb_common::{
anyhow::anyhow,
message_proto::{video_frame, Message, VP9s, VideoCodecState},
message_proto::{video_frame, ImageQuality, Message, VP9s, VideoCodecState},
ResultType,
};
#[cfg(feature = "hwcodec")]
@@ -28,9 +28,9 @@ lazy_static::lazy_static! {
#[derive(Debug, Clone)]
pub struct HwEncoderConfig {
pub codec_name: String,
pub fps: i32,
pub width: usize,
pub height: usize,
pub quallity: ImageQuality,
}
pub enum EncoderCfg {
@@ -78,6 +78,13 @@ pub struct Decoder {
i420: Vec<u8>,
}
#[derive(Debug, Clone)]
pub enum EncoderUpdate {
State(VideoCodecState),
Remove,
DisableHwIfNotExist,
}
impl Encoder {
pub fn new(config: EncoderCfg) -> ResultType<Encoder> {
match config {
@@ -95,14 +102,23 @@ impl Encoder {
}
// TODO
pub fn update_video_encoder(id: i32, decoder: Option<VideoCodecState>) {
pub fn update_video_encoder(id: i32, update: EncoderUpdate) {
#[cfg(feature = "hwcodec")]
{
let mut states = VIDEO_CODEC_STATES.lock().unwrap();
match decoder {
Some(decoder) => states.insert(id, decoder),
None => states.remove(&id),
};
match update {
EncoderUpdate::State(state) => {
states.insert(id, state);
}
EncoderUpdate::Remove => {
states.remove(&id);
}
EncoderUpdate::DisableHwIfNotExist => {
if !states.contains_key(&id) {
states.insert(id, VideoCodecState::default());
}
}
}
let (encoder_h264, encoder_h265) = HwEncoder::best();
let mut enabled_h264 = encoder_h264.is_some();
let mut enabled_h265 = encoder_h265.is_some();
@@ -142,7 +158,7 @@ impl Encoder {
#[cfg(not(feature = "hwcodec"))]
{
let _ = id;
let _ = decoder;
let _ = update;
}
}
#[inline]

View File

@@ -5,7 +5,7 @@ use crate::{
use hbb_common::{
anyhow::{anyhow, Context},
lazy_static, log,
message_proto::{H264s, H265s, Message, VideoFrame, H264, H265},
message_proto::{H264s, H265s, ImageQuality, Message, VideoFrame, H264, H265},
ResultType,
};
use hwcodec::{
@@ -13,6 +13,8 @@ use hwcodec::{
encode::{EncodeContext, EncodeFrame, Encoder},
ffmpeg::{CodecInfo, DataFormat},
AVPixelFormat,
Quality::{self, *},
RateContorl::{self, *},
};
use std::sync::{Arc, Mutex, Once};
@@ -25,6 +27,10 @@ lazy_static::lazy_static! {
}
const DEFAULT_PIXFMT: AVPixelFormat = AVPixelFormat::AV_PIX_FMT_YUV420P;
const DEFAULT_TIME_BASE: [i32; 2] = [1, 30];
const DEFAULT_GOP: i32 = 60;
const DEFAULT_HW_QUALITY: Quality = Quality_Default;
const DEFAULT_RC: RateContorl = RC_DEFAULT;
pub struct HwEncoder {
encoder: Encoder,
@@ -40,13 +46,19 @@ impl EncoderApi for HwEncoder {
{
match cfg {
EncoderCfg::HW(config) => {
let (bitrate, timebase, gop, quality, rc) =
HwEncoder::convert_quality(&config.codec_name, config.quallity);
let ctx = EncodeContext {
name: config.codec_name.clone(),
fps: config.fps as _,
width: config.width as _,
height: config.height as _,
pixfmt: DEFAULT_PIXFMT,
align: HW_STRIDE_ALIGN as _,
bitrate,
timebase,
gop,
quality,
rc,
};
let format = match Encoder::format_from_name(config.codec_name.clone()) {
Ok(format) => format,
@@ -131,11 +143,15 @@ impl HwEncoder {
pub fn best() -> (Option<CodecInfo>, Option<CodecInfo>) {
let ctx = EncodeContext {
name: String::from(""),
fps: 30,
width: 1920,
height: 1080,
pixfmt: DEFAULT_PIXFMT,
align: HW_STRIDE_ALIGN as _,
bitrate: 0,
timebase: DEFAULT_TIME_BASE,
gop: DEFAULT_GOP,
quality: DEFAULT_HW_QUALITY,
rc: DEFAULT_RC,
};
CodecInfo::score(Encoder::avaliable_encoders(ctx))
}
@@ -175,6 +191,38 @@ impl HwEncoder {
Err(_) => Ok(Vec::<EncodeFrame>::new()),
}
}
fn convert_quality(name: &str, q: ImageQuality) -> (i32, [i32; 2], i32, Quality, RateContorl) {
// TODO
let bitrate = if name.contains("qsv") {
1_000_000
} else {
2_000_000
};
match q {
ImageQuality::Low => (
bitrate / 2,
DEFAULT_TIME_BASE,
DEFAULT_GOP,
DEFAULT_HW_QUALITY,
DEFAULT_RC,
),
ImageQuality::Best => (
bitrate * 2,
DEFAULT_TIME_BASE,
DEFAULT_GOP,
DEFAULT_HW_QUALITY,
DEFAULT_RC,
),
ImageQuality::NotSet | ImageQuality::Balanced => (
0,
DEFAULT_TIME_BASE,
DEFAULT_GOP,
DEFAULT_HW_QUALITY,
DEFAULT_RC,
),
}
}
}
pub struct HwDecoder {