From 3a2bdef8b930fc13c1e0ec9e80c2492e9575e213 Mon Sep 17 00:00:00 2001
From: philippegorley <philippe.gorley@savoirfairelinux.com>
Date: Tue, 7 Nov 2017 13:48:58 -0500
Subject: [PATCH] encoder: drop print_averror
This function hides the location where the error occurred, the daemon's
logs always pointed to print_averror with a failure of av_write_frame.
Change-Id: I25b703fc44969cc6726f11ed09ed67cc3edb6696
Reviewed-by: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
---
src/media/media_encoder.cpp | 32 +++++++++++++++-----------------
1 file changed, 15 insertions(+), 17 deletions(-)
diff --git a/src/media/media_encoder.cpp b/src/media/media_encoder.cpp
index be99ec9163..d9e288f950 100644
--- a/src/media/media_encoder.cpp
+++ b/src/media/media_encoder.cpp
@@ -268,14 +268,6 @@ MediaEncoder::startIO()
av_dump_format(outputCtx_, 0, outputCtx_->filename, 1);
}
-static void
-print_averror(const char *funcname, int err)
-{
- char errbuf[64];
- av_strerror(err, errbuf, sizeof(errbuf));
- RING_ERR("%s failed: %s", funcname, errbuf);
-}
-
#ifdef RING_VIDEO
int
MediaEncoder::encode(VideoFrame& input, bool is_keyframe,
@@ -325,9 +317,11 @@ MediaEncoder::encode(VideoFrame& input, bool is_keyframe,
// write the compressed frame
ret = av_write_frame(outputCtx_, &pkt);
- if (ret < 0)
- print_averror("av_write_frame", ret);
- else
+ if (ret < 0) {
+ char errbuf[64];
+ av_strerror(ret, errbuf, sizeof(errbuf));
+ RING_ERR("av_write_frame failed: %s", errbuf);
+ } else
break;
}
}
@@ -431,9 +425,11 @@ int MediaEncoder::encode_audio(const AudioBuffer &buffer)
// write the compressed frame
ret = av_write_frame(outputCtx_, &pkt);
- if (ret < 0)
- print_averror("av_write_frame", ret);
- else
+ if (ret < 0) {
+ char errbuf[64];
+ av_strerror(ret, errbuf, sizeof(errbuf));
+ RING_ERR("av_write_frame failed: %s", errbuf);
+ } else
break;
}
}
@@ -475,9 +471,11 @@ int MediaEncoder::flush()
// write the compressed frame
ret = av_write_frame(outputCtx_, &pkt);
- if (ret < 0)
- print_averror("av_write_frame", ret);
- else
+ if (ret < 0) {
+ char errbuf[64];
+ av_strerror(ret, errbuf, sizeof(errbuf));
+ RING_ERR("av_write_frame failed: %s", errbuf);
+ } else
break;
}
}
--
GitLab