AMFTraceWriter is abstraction to configure how AMF outputs its logs for current
process, not for component.
Example instances of AMFTraceWriter can be
* FileWriter
* SocketWriter
* DebugOutputWriter
* LibavWriter (output using av_log function).
AMFTraceWriter can be Registered/Unregistered/Enabled/Disabled and configured
to output particular level of trace output.
If we use multiple LibavWriter objects in one process, we will have duplication
of output in avlib log.
To prevent this scenario we should use one constant writer_id .
---
libavcodec/amfenc.c | 8 +++++---
libavcodec/amfenc.h | 4 +---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c
index f305a48bf..ef4350d1c 100644
--- a/libavcodec/amfenc.c
+++ b/libavcodec/amfenc.c
@@ -46,6 +46,8 @@
#include <dlfcn.h>
#endif
+#define LIBAV_AMF_WRITER_ID L"libav_log"
+
#define PTS_PROP L"PtsProp"
const enum AVPixelFormat ff_amf_pix_fmts[] = {
@@ -171,8 +173,8 @@ static int amf_init_context(AVCodecContext *avctx)
// connect AMF logger to av_log
ctx->tracer.vtbl = &tracer_vtbl;
ctx->tracer.avctx = avctx;
- ctx->trace->pVtbl->RegisterWriter(ctx->trace, ctx->writer_id,
(AMFTraceWriter*)&ctx->tracer, 1);
- ctx->trace->pVtbl->SetWriterLevel(ctx->trace, ctx->writer_id,
AMF_TRACE_TRACE);
+ ctx->trace->pVtbl->RegisterWriter(ctx->trace,
LIBAV_AMF_WRITER_ID,(AMFTraceWriter*)&ctx->tracer, 1);
+ ctx->trace->pVtbl->SetWriterLevel(ctx->trace, LIBAV_AMF_WRITER_ID,
AMF_TRACE_TRACE);
res = ctx->factory->pVtbl->CreateContext(ctx->factory, &ctx->context);
AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR_UNKNOWN, "CreateContext()
failed with error %d\n", res);
@@ -283,7 +285,7 @@ int av_cold ff_amf_encode_close(AVCodecContext *avctx)
av_buffer_unref(&ctx->hw_frames_ctx);
if (ctx->trace) {
- ctx->trace->pVtbl->UnregisterWriter(ctx->trace, ctx->writer_id);
+ ctx->trace->pVtbl->UnregisterWriter(ctx->trace, LIBAV_AMF_WRITER_ID);
}
if (ctx->library) {
dlclose(ctx->library);
diff --git a/libavcodec/amfenc.h b/libavcodec/amfenc.h
index f3b82be77..a8153ef12 100644
--- a/libavcodec/amfenc.h
+++ b/libavcodec/amfenc.h
@@ -80,7 +80,6 @@ typedef struct AmfContext {
// common encoder options
int log_to_dbg;
- char *writer_id;
// Static options, have to be set before Init() call
int usage;
@@ -152,7 +151,6 @@ extern const enum AVPixelFormat ff_amf_pix_fmts[];
}
#define AMF_COMMON_OPTIONS \
- { "log_to_dbg", "Enable AMF logging to debug output",
OFFSET(log_to_dbg), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, \
- { "writer_id", "Enable AMF logging to writer id",
OFFSET(writer_id), AV_OPT_TYPE_STRING, { .str = "libavcodec" }, 0, 1, VE } \
+ { "log_to_dbg", "Enable AMF logging to debug output",
OFFSET(log_to_dbg), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE } \
#endif //AVCODEC_AMFENC_H
--
2.16.2.windows.1
________________________________
This e-mail and any attachment(s) are intended only for the recipient(s) named
above and others who have been specifically authorized to receive them. They
may contain confidential information. If you are not the intended recipient,
please do not read this email or its attachment(s). Furthermore, you are hereby
notified that any dissemination, distribution or copying of this e-mail and any
attachment(s) is strictly prohibited. If you have received this e-mail in
error, please immediately notify the sender by replying to this e-mail and then
delete this e-mail and any attachment(s) or copies thereof from your system.
Thank you.
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
