| Message ID | 8f101a2d-650e-1200-a8ee-b9ca48f9f753@yahoo.co.jp |
|---|---|
| State | Superseded |
| Headers | show |
On Tue, Feb 07, 2017 at 06:28:11AM +0900, Takayuki 'January June' Suwa wrote: > This adds "-profile[:v] profile_name"-style option IOW. > > Thanks for reviewing my poor ugly patch, Mark... and I get back to > an original purpose - forcing OMX to use baseline profile. > (eg. RasPiCam-to-Ustream webcasting w/o additional xcoding) > --- > libavcodec/omx.c | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > > diff --git a/libavcodec/omx.c b/libavcodec/omx.c > index 16df50e..faa70ae 100644 > --- a/libavcodec/omx.c > +++ b/libavcodec/omx.c > @@ -226,6 +226,7 @@ typedef struct OMXCodecContext { > int output_buf_size; > > int input_zerocopy; > + int profile; > } OMXCodecContext; > > static void append_buffer(pthread_mutex_t *mutex, pthread_cond_t *cond, > @@ -523,6 +524,20 @@ static av_cold int > omx_component_init(AVCodecContext *avctx, const char *role) > CHECK(err); > avc.nBFrames = 0; > avc.nPFrames = avctx->gop_size - 1; > + switch (s->profile) { > + case FF_PROFILE_H264_BASELINE: > + avctx->profile = s->profile; > + avc.eProfile = OMX_VIDEO_AVCProfileBaseline; > + break; > + case FF_PROFILE_H264_MAIN: > + avctx->profile = s->profile; > + avc.eProfile = OMX_VIDEO_AVCProfileMain; > + break; > + case FF_PROFILE_H264_HIGH: > + avctx->profile = s->profile; > + avc.eProfile = OMX_VIDEO_AVCProfileHigh; > + break; > + } > err = OMX_SetParameter(s->handle, OMX_IndexParamVideoAvc, &avc); > CHECK(err); > } > @@ -884,6 +899,10 @@ static const AVOption options[] = { > { "omx_libname", "OpenMAX library name", OFFSET(libname), > AV_OPT_TYPE_STRING, { 0 }, 0, 0, VDE }, > { "omx_libprefix", "OpenMAX library prefix", OFFSET(libprefix), > AV_OPT_TYPE_STRING, { 0 }, 0, 0, VDE }, There are some extraneous newlines in the patch which cause git am to fail "error: corrupt patch at line 18" [...]
diff --git a/libavcodec/omx.c b/libavcodec/omx.c index 16df50e..faa70ae 100644 --- a/libavcodec/omx.c +++ b/libavcodec/omx.c @@ -226,6 +226,7 @@ typedef struct OMXCodecContext { int output_buf_size; int input_zerocopy; + int profile; } OMXCodecContext; static void append_buffer(pthread_mutex_t *mutex, pthread_cond_t *cond, @@ -523,6 +524,20 @@ static av_cold int omx_component_init(AVCodecContext *avctx, const char *role) CHECK(err); avc.nBFrames = 0; avc.nPFrames = avctx->gop_size - 1; + switch (s->profile) { + case FF_PROFILE_H264_BASELINE: + avctx->profile = s->profile; + avc.eProfile = OMX_VIDEO_AVCProfileBaseline; + break; + case FF_PROFILE_H264_MAIN: + avctx->profile = s->profile; + avc.eProfile = OMX_VIDEO_AVCProfileMain; + break; + case FF_PROFILE_H264_HIGH: + avctx->profile = s->profile; + avc.eProfile = OMX_VIDEO_AVCProfileHigh; + break; + } err = OMX_SetParameter(s->handle, OMX_IndexParamVideoAvc, &avc); CHECK(err);
This adds "-profile[:v] profile_name"-style option IOW. Thanks for reviewing my poor ugly patch, Mark... and I get back to an original purpose - forcing OMX to use baseline profile. (eg. RasPiCam-to-Ustream webcasting w/o additional xcoding) --- libavcodec/omx.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) } @@ -884,6 +899,10 @@ static const AVOption options[] = { { "omx_libname", "OpenMAX library name", OFFSET(libname), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VDE }, { "omx_libprefix", "OpenMAX library prefix", OFFSET(libprefix), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VDE }, { "zerocopy", "Try to avoid copying input frames if possible", OFFSET(input_zerocopy), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, + { "profile", "Set the encoding profile", OFFSET(profile), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, FF_PROFILE_H264_HIGH, VE, "profile" }, + { "baseline", "", 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_H264_BASELINE }, 0, 0, VE, "profile" }, + { "main", "", 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_H264_MAIN }, 0, 0, VE, "profile" }, + { "high", "", 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_H264_HIGH }, 0, 0, VE, "profile" }, { NULL } };