kopia lustrzana https://github.com/f4exb/sdrangel
DATV demod. final cleanuo, Implements #833
rodzic
64316e5d7f
commit
25a4118e16
|
@ -717,21 +717,18 @@ int DATVideoRender::newDecode(AVCodecContext *avctx, AVFrame *frame, int *got_fr
|
||||||
ret = avcodec_send_packet(avctx, pkt);
|
ret = avcodec_send_packet(avctx, pkt);
|
||||||
// In particular, we don't expect AVERROR(EAGAIN), because we read all
|
// In particular, we don't expect AVERROR(EAGAIN), because we read all
|
||||||
// decoded frames with avcodec_receive_frame() until done.
|
// decoded frames with avcodec_receive_frame() until done.
|
||||||
if (ret < 0)
|
if (ret < 0) {
|
||||||
{
|
|
||||||
return ret == AVERROR_EOF ? 0 : ret;
|
return ret == AVERROR_EOF ? 0 : ret;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = avcodec_receive_frame(avctx, frame);
|
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;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ret >= 0)
|
if (ret >= 0) {
|
||||||
{
|
|
||||||
*got_frame = 1;
|
*got_frame = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -216,7 +216,7 @@ const QMap<QString, QString> WebAPIUtils::m_sourceDeviceHwIdToActionsKey = {
|
||||||
};
|
};
|
||||||
|
|
||||||
const QMap<QString, QString> WebAPIUtils::m_sinkDeviceHwIdToSettingsKey = {
|
const QMap<QString, QString> WebAPIUtils::m_sinkDeviceHwIdToSettingsKey = {
|
||||||
{"AudioOutput", "AudioOutputSettings"},
|
{"AudioOutput", "audioOutputSettings"},
|
||||||
{"BladeRF1", "bladeRF1OutputSettings"},
|
{"BladeRF1", "bladeRF1OutputSettings"},
|
||||||
{"BladeRF2", "bladeRF2OutputSettings"},
|
{"BladeRF2", "bladeRF2OutputSettings"},
|
||||||
{"HackRF", "hackRFOutputSettings"},
|
{"HackRF", "hackRFOutputSettings"},
|
||||||
|
|
|
@ -79,7 +79,6 @@ private:
|
||||||
QTimer m_timer;
|
QTimer m_timer;
|
||||||
QMutex m_mutex;
|
QMutex m_mutex;
|
||||||
bool m_dataChanged;
|
bool m_dataChanged;
|
||||||
bool m_configChanged;
|
|
||||||
|
|
||||||
GLShaderTVArray m_glShaderArray;
|
GLShaderTVArray m_glShaderArray;
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue