encoders/prores_aw: Fix warnings and formatting

This commit is contained in:
Michael Fabian 'Xaymar' Dirks
2019-07-06 13:07:31 +02:00
parent 3154443e18
commit 93c6f0b35a
2 changed files with 14 additions and 15 deletions
+4 -4
View File
@@ -241,9 +241,9 @@ obsffmpeg::encoder::prores_aw::~prores_aw()
}
}
void obsffmpeg::encoder::prores_aw::get_properties(obs_properties_t* props) {}
void obsffmpeg::encoder::prores_aw::get_properties(obs_properties_t*) {}
bool obsffmpeg::encoder::prores_aw::update(obs_data_t* settings)
bool obsffmpeg::encoder::prores_aw::update(obs_data_t*)
{
return false;
}
@@ -258,12 +258,12 @@ bool obsffmpeg::encoder::prores_aw::get_extra_data(uint8_t** extra_data, size_t*
return true;
}
bool obsffmpeg::encoder::prores_aw::get_sei_data(uint8_t** sei_data, size_t* size)
bool obsffmpeg::encoder::prores_aw::get_sei_data(uint8_t**, size_t*)
{
return false;
}
void obsffmpeg::encoder::prores_aw::get_video_info(video_scale_info* info)
void obsffmpeg::encoder::prores_aw::get_video_info(video_scale_info*)
{
return;
}
+10 -11
View File
@@ -20,8 +20,8 @@
#pragma once
#include <encoder.hpp>
#include "ffmpeg/avframe-queue.hpp"
#include <vector>
#include "ffmpeg/avframe-queue.hpp"
extern "C" {
#include <libavcodec/avcodec.h>
@@ -31,21 +31,20 @@ namespace obsffmpeg {
namespace encoder {
class prores_aw : base {
enum class profile {
Auto = FF_PROFILE_UNKNOWN,
Proxy = 0 /*FF_PROFILE_PRORES_PROXY*/,
Light = 1 /*FF_PROFILE_PRORES_LT*/,
Standard = 2 /*FF_PROFILE_PRORES_STANDARD*/,
HighQuality = 3 /*FF_PROFILE_PRORES_HQ*/,
FourFourFourFour = 4 /*FF_PROFILE_PRORES_4444*/ // Automatically set if I444 or RGB input.
Auto = FF_PROFILE_UNKNOWN,
Proxy = 0 /*FF_PROFILE_PRORES_PROXY*/,
Light = 1 /*FF_PROFILE_PRORES_LT*/,
Standard = 2 /*FF_PROFILE_PRORES_STANDARD*/,
HighQuality = 3 /*FF_PROFILE_PRORES_HQ*/,
FourFourFourFour =
4 /*FF_PROFILE_PRORES_4444*/ // Automatically set if I444 or RGB input.
};
private:
profile video_profile = profile::Auto;
profile video_profile = profile::Auto;
ffmpeg::avframe_queue frame_queue;
ffmpeg::avframe_queue frame_queue_used;
AVPacket* current_packet = nullptr;
AVPacket* current_packet = nullptr;
public:
prores_aw(obs_data_t* settings, obs_encoder_t* encoder);