VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-23 01:55:48 -05:00
Code Issues Projects Releases Wiki Activity

DATV demod. final cleanuo, Implements #833

Browse Source
This commit is contained in:
f4exb 2021-04-08 06:47:33 +02:00
parent 64316e5d7f
commit 25a4118e16
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/channelrx/demoddatv/datvideorender.cpp
View File

@ -717,21 +717,18 @@ int DATVideoRender::newDecode(AVCodecContext *avctx, AVFrame *frame, int *got_fr
ret = avcodec_send_packet(avctx, pkt);
// In particular, we don't expect AVERROR(EAGAIN), because we read all
// decoded frames with avcodec_receive_frame() until done.
if (ret < 0)
{
if (ret < 0) {
return ret == AVERROR_EOF ? 0 : ret;
}
}
ret = avcodec_receive_frame(avctx, frame);
if (ret < 0 && ret != AVERROR(EAGAIN) && ret != AVERROR_EOF)
{
if (ret < 0 && ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) {
return ret;
}
if (ret >= 0)
{
if (ret >= 0) {
*got_frame = 1;
}

2
sdrbase/webapi/webapiutils.cpp
View File

@ -216,7 +216,7 @@ const QMap<QString, QString> WebAPIUtils::m_sourceDeviceHwIdToActionsKey = {
};
const QMap<QString, QString> WebAPIUtils::m_sinkDeviceHwIdToSettingsKey = {
{"AudioOutput", "AudioOutputSettings"},
{"AudioOutput", "audioOutputSettings"},
{"BladeRF1", "bladeRF1OutputSettings"},
{"BladeRF2", "bladeRF2OutputSettings"},
{"HackRF", "hackRFOutputSettings"},

1
sdrgui/gui/tvscreen.h
View File

@ -79,7 +79,6 @@ private:
QTimer m_timer;
QMutex m_mutex;
bool m_dataChanged;
bool m_configChanged;
GLShaderTVArray m_glShaderArray;