francesco/fml13v01-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'CR_745_FFMPEG_Arvin.zhu' into 'jh7110-mm-devel'

Browse Source 
ffmpeg: enable omx

See merge request sdk/buildroot!9
This commit is contained in:
andy.hu
2022-06-09 09:45:58 +00:00
committed by Andy Hu
parent 9ee1ba882a 2dd50f0663
commit 4247f3f119
2 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package/ffmpeg/0009-ffmpeg-add-mjpeg-decoder-support-and-fix-some-bug.patch
+16 -16
View File
@@ -68,22 +68,22 @@ index 86e32a8..023db9c 100644
break; break;
- } else { - } else {
+ } else if (avctx->codec->id == AV_CODEC_ID_HEVC) { + } else if (avctx->codec->id == AV_CODEC_ID_HEVC) {
++ // For H.265, the extradata can be returned in two separate buffers + // For H.265, the extradata can be returned in two separate buffers
++ // (the videocore encoder on raspberry pi does this); + // (the videocore encoder on raspberry pi does this);
++ // therefore check that we have got both SPS and PPS before continuing. + // therefore check that we have got both SPS and PPS before continuing.
++ int nals[128] = { 0 }; + int nals[128] = { 0 };
++ int i; + int i;
++ for (i = 0; i + 4 < avctx->extradata_size; i++) { + for (i = 0; i + 4 < avctx->extradata_size; i++) {
++ if (!avctx->extradata[i + 0] && + if (!avctx->extradata[i + 0] &&
++ !avctx->extradata[i + 1] && + !avctx->extradata[i + 1] &&
++ !avctx->extradata[i + 2] && + !avctx->extradata[i + 2] &&
++ avctx->extradata[i + 3] == 1) { + avctx->extradata[i + 3] == 1) {
++ nals[(avctx->extradata[i + 4] & 0x7E) >> 1]++; + nals[(avctx->extradata[i + 4] & 0x7E) >> 1]++;
++ } + }
++ } + }
++ if (nals[HEVC_NAL_SPS] && nals[HEVC_NAL_PPS] && nals[HEVC_NAL_VPS]) + if (nals[HEVC_NAL_SPS] && nals[HEVC_NAL_PPS] && nals[HEVC_NAL_VPS])
++ break; + break;
++ } else { + } else {
if (avctx->extradata_size > 0) if (avctx->extradata_size > 0)
break; break;
} }
package/ffmpeg/ffmpeg.mk
+11
View File
@@ -189,6 +189,13 @@ else
FFMPEG_CONF_OPTS += --disable-outdevs FFMPEG_CONF_OPTS += --disable-outdevs
endif endif
ifeq ($(BR2_PACKAGE_PULSEAUDIO),y)
FFMPEG_CONF_OPTS += --enable-libpulse
FFMPEG_DEPENDENCIES += pulseaudio
else
FFMPEG_CONF_OPTS += --disable-libpulse
endif
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
FFMPEG_CONF_OPTS += --enable-pthreads FFMPEG_CONF_OPTS += --enable-pthreads
else else
@@ -285,6 +292,10 @@ ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
FFMPEG_CONF_OPTS += --enable-mmal --enable-omx --enable-omx-rpi \ FFMPEG_CONF_OPTS += --enable-mmal --enable-omx --enable-omx-rpi \
--extra-cflags=-I$(STAGING_DIR)/usr/include/IL --extra-cflags=-I$(STAGING_DIR)/usr/include/IL
FFMPEG_DEPENDENCIES += rpi-userland FFMPEG_DEPENDENCIES += rpi-userland
else ifeq ($(BR2_PACKAGE_SF_OMX_IL),y)
FFMPEG_CONF_OPTS += --disable-mmal --enable-omx --disable-omx-rpi \
--extra-cflags=-I$(STAGING_DIR)/usr/include/omx-il
FFMPEG_DEPENDENCIES += sf-omx-il
else else
FFMPEG_CONF_OPTS += --disable-mmal --disable-omx --disable-omx-rpi FFMPEG_CONF_OPTS += --disable-mmal --disable-omx --disable-omx-rpi
endif endif