Skip to content

Commit

Permalink
mm-video: vidc: Add support for picture order count
Browse files Browse the repository at this point in the history 
Add support for picture order count. By default PicOrderType
is set to 2 for H264 encode. Setting this parameter in the
sps/pps to 2 causes the decoder to return the first I-frame
immediately after decode, as opposed to holding onto it
until the next frame. Apps can configure it via OMX
Get/Set API.

Change-Id: I57c6287603747ef7e838e7017e2378a6c9e736af
Signed-off-by: spezi77 <[email protected]>

Conflicts:
	mm-core/inc/OMX_QCOMExtns.h
	mm-video/vidc/venc/inc/omx_video_base.h
	mm-video/vidc/venc/inc/video_encoder_device.h
	mm-video/vidc/venc/src/omx_video_base.cpp
	mm-video/vidc/venc/src/omx_video_encoder.cpp
	mm-video/vidc/venc/src/video_encoder_device.cpp
  • Loading branch information
Deva Ramasubramanian authored and spezi77 committed Feb 2, 2016
1 parent b5b797f commit 6154397
Show file tree
Hide file tree
Showing 6 changed files with 6,988 additions and 6,178 deletions.
32 changes: 31 additions & 1 deletion mm-core/inc/OMX_QCOMExtns.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,22 @@ enum OMX_QCOM_EXTN_INDEXTYPE
OMX_QcomIndexEnableExtnUserData = 0x7F000020,

/*"OMX.QCOM.index.param.video.EnableSmoothStreaming"*/
OMX_QcomIndexParamEnableSmoothStreaming = 0x7F000021,
OMX_QcomIndexParamEnableSmoothStreaming = 0x7F000022,

/*"OMX.QCOM.index.param.video.QPRange" */
OMX_QcomIndexParamVideoQPRange = 0x7F000023,

OMX_QcomIndexParamEnableVUIStreamRestrictFlag = 0x7F000024,

/*"OMX.QCOM.index.config.TurboMode"*/
OMX_QcomIndexConfigTurboMode = 0x7F000025,

/*"OMX.QCOM.index.param.video.PerformanceLevel" */
OMX_QcomIndexParamVideoPerformanceLevel = 0x7F000026,

OMX_GoogleAndroidIndexPrepareForAdaptivePlayback = 0x7F00002D,

OMX_QcomIndexParamPictureOrderCountType = 0x7F000054,
};

/**
Expand Down Expand Up @@ -874,6 +889,21 @@ typedef enum {
QOMX_VIDEO_CONTENT_RL_VIEW = 2,
} QOMX_VIDEO_CONTENT_INTERPRETATION;

// A pointer to this struct is passed to OMX_SetParameter when the extension
// index for the 'OMX.google.android.index.setVUIStreamRestrictFlag' extension
// is given.
typedef struct QOMX_VUI_BITSTREAM_RESTRICT {
OMX_U32 nSize;
OMX_VERSIONTYPE nVersion;
OMX_BOOL bEnable;
} QOMX_VUI_BITSTREAM_RESTRICT;

typedef struct QOMX_PICTURE_ORDER_COUNT_TYPE {
OMX_U32 nSize;
OMX_VERSIONTYPE nVersion;
OMX_U32 nType;
} QOMX_PICTURE_ORDER_COUNT_TYPE;

#ifdef __cplusplus
}
#endif /* __cplusplus */
Expand Down
3 changes: 2 additions & 1 deletion mm-video/vidc/venc/inc/omx_video_base.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,8 @@ class omx_video: public qc_omx_component
OMX_VIDEO_PARAM_INTRAREFRESHTYPE m_sIntraRefresh;
OMX_U32 m_sExtraData;
OMX_U32 m_sDebugSliceinfo;

OMX_U32 m_input_msg_id;
QOMX_PICTURE_ORDER_COUNT_TYPE m_sPicureOrderCount;
// fill this buffer queue
omx_cmd_queue m_ftb_q;
// Command Q for rest of the events
Expand Down
336 changes: 175 additions & 161 deletions mm-video/vidc/venc/inc/video_encoder_device.h
View file
Original file line number Diff line number Diff line change
@@ -1,161 +1,175 @@
/*--------------------------------------------------------------------------
Copyright (c) 2010-2012, Code Aurora Forum. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of Code Aurora nor
the names of its contributors may be used to endorse or promote
products derived from this software without specific prior written
permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------*/
#ifndef __OMX_VENC_DEV__
#define __OMX_VENC_DEV__

#include "OMX_Types.h"
#include "OMX_Core.h"
#include "OMX_QCOMExtns.h"
#include "qc_omx_component.h"
#include "omx_video_common.h"
#include <linux/msm_vidc_enc.h>
#include <pthread.h>
#include <linux/videodev2.h>
#include <poll.h>
#define TIMEOUT 5000
#define MAX_RECON_BUFFERS 4

void* async_venc_message_thread (void *);

class venc_dev
{
public:
venc_dev(class omx_venc *venc_class); //constructor
~venc_dev(); //des

bool venc_open(OMX_U32);
void venc_close();
unsigned venc_stop(void);
unsigned venc_pause(void);
unsigned venc_start(void);
unsigned venc_flush(unsigned);
#ifdef _ANDROID_ICS_
bool venc_set_meta_mode(bool);
#endif
unsigned venc_resume(void);
unsigned venc_start_done(void);
unsigned venc_stop_done(void);
bool venc_use_buf(void*, unsigned,unsigned);
bool venc_free_buf(void*, unsigned);
bool venc_empty_buf(void *, void *,unsigned,unsigned);
bool venc_fill_buf(void *, void *,unsigned,unsigned);

bool venc_get_buf_req(unsigned long *,unsigned long *,
unsigned long *,unsigned long);
bool venc_set_buf_req(unsigned long *,unsigned long *,
unsigned long *,unsigned long);
bool venc_set_param(void *,OMX_INDEXTYPE);
bool venc_set_config(void *configData, OMX_INDEXTYPE index);
bool venc_get_profile_level(OMX_U32 *eProfile,OMX_U32 *eLevel);
bool venc_max_allowed_bitrate_check(OMX_U32 nTargetBitrate);
bool venc_get_seq_hdr(void *, unsigned, unsigned *);
bool venc_loaded_start(void);
bool venc_loaded_stop(void);
bool venc_loaded_start_done(void);
bool venc_loaded_stop_done(void);
OMX_U32 m_nDriver_fd;
bool m_profile_set;
bool m_level_set;
pthread_mutex_t loaded_start_stop_mlock;
pthread_cond_t loaded_start_stop_cond;

struct recon_buffer {
unsigned char* virtual_address;
int pmem_fd;
int size;
int alignment;
int offset;
#ifdef USE_ION
int ion_device_fd;
struct ion_allocation_data alloc_data;
struct ion_fd_data ion_alloc_fd;
#endif
};

recon_buffer recon_buff[MAX_RECON_BUFFERS];
int recon_buffers_count;
bool m_max_allowed_bitrate_check;
int m_eProfile;
int m_eLevel;
int etb_count;
private:
struct venc_basecfg m_sVenc_cfg;
struct venc_ratectrlcfg rate_ctrl;
struct venc_targetbitrate bitrate;
struct venc_intraperiod intra_period;
struct venc_profile codec_profile;
struct ven_profilelevel profile_level;
struct venc_switch set_param;
struct venc_voptimingcfg time_inc;
struct venc_allocatorproperty m_sInput_buff_property;
struct venc_allocatorproperty m_sOutput_buff_property;
struct venc_sessionqp session_qp;
struct venc_multiclicecfg multislice;
struct venc_entropycfg entropy;
struct venc_dbcfg dbkfilter;
struct venc_intrarefresh intra_refresh;
struct venc_headerextension hec;
struct venc_voptimingcfg voptimecfg;
struct venc_seqheader seqhdr;

bool venc_set_profile_level(OMX_U32 eProfile,OMX_U32 eLevel);
bool venc_set_intra_period(OMX_U32 nPFrames, OMX_U32 nBFrames);
bool venc_set_target_bitrate(OMX_U32 nTargetBitrate, OMX_U32 config);
bool venc_set_ratectrl_cfg(OMX_VIDEO_CONTROLRATETYPE eControlRate);
bool venc_set_session_qp(OMX_U32 i_frame_qp, OMX_U32 p_frame_qp);
bool venc_set_extradata(OMX_U32 extra_data);
bool venc_set_encode_framerate(OMX_U32 encode_framerate, OMX_U32 config);
bool venc_set_intra_vop_refresh(OMX_BOOL intra_vop_refresh);
bool venc_set_color_format(OMX_COLOR_FORMATTYPE color_format);
bool venc_validate_profile_level(OMX_U32 *eProfile, OMX_U32 *eLevel);
bool venc_set_multislice_cfg(OMX_INDEXTYPE codec, OMX_U32 slicesize);
bool venc_set_entropy_config(OMX_BOOL enable, OMX_U32 i_cabac_level);
bool venc_set_inloop_filter(OMX_VIDEO_AVCLOOPFILTERTYPE loop_filter);
bool venc_set_intra_refresh (OMX_VIDEO_INTRAREFRESHTYPE intrarefresh, OMX_U32 nMBs);
bool venc_set_error_resilience(OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE* error_resilience);
bool venc_set_voptiming_cfg(OMX_U32 nTimeIncRes);
void venc_config_print();
bool venc_set_slice_delivery_mode(OMX_BOOL enable);
#ifdef MAX_RES_1080P
OMX_U32 pmem_free();
OMX_U32 pmem_allocate(OMX_U32 size, OMX_U32 alignment, OMX_U32 count);
OMX_U32 venc_allocate_recon_buffers();
inline int clip2(int x)
{
x = x -1;
x = x | x >> 1;
x = x | x >> 2;
x = x | x >> 4;
x = x | x >> 16;
x = x + 1;
return x;
}
#endif
};

#endif
/*--------------------------------------------------------------------------
Copyright (c) 2010-2013, 2015, The Linux Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of The Linux Foundation nor
the names of its contributors may be used to endorse or promote
products derived from this software without specific prior written
permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------*/
#ifndef __OMX_VENC_DEV__
#define __OMX_VENC_DEV__

#include "OMX_Types.h"
#include "OMX_Core.h"
#include "OMX_QCOMExtns.h"
#include "qc_omx_component.h"
#include "omx_video_common.h"
#include <linux/msm_vidc_enc.h>
#include <pthread.h>
#include <linux/videodev2.h>
#include <poll.h>
#define TIMEOUT 5000
#define MAX_RECON_BUFFERS 4
/* 1080P video hardware does not support slice size less than */
/* 1900 bits for multi slice settings in bits mode */
#define MIN_SLICE_BITS_1080P 1900

void* async_venc_message_thread (void *);

class venc_dev
{
public:
venc_dev(class omx_venc *venc_class); //constructor
~venc_dev(); //des

bool venc_open(OMX_U32);
void venc_close();
unsigned venc_stop(void);
unsigned venc_pause(void);
unsigned venc_start(void);
unsigned venc_flush(unsigned);
#ifdef _ANDROID_ICS_
bool venc_set_meta_mode(bool);
#endif
unsigned venc_resume(void);
unsigned venc_start_done(void);
unsigned venc_stop_done(void);
bool venc_use_buf(void*, unsigned,unsigned);
bool venc_free_buf(void*, unsigned);
bool venc_empty_buf(void *, void *,unsigned,unsigned);
bool venc_fill_buf(void *, void *,unsigned,unsigned);

bool venc_get_buf_req(unsigned long *,unsigned long *,
unsigned long *,unsigned long);
bool venc_set_buf_req(unsigned long *,unsigned long *,
unsigned long *,unsigned long);
bool venc_get_curr_perf_lvl(OMX_PTR);
bool venc_set_param(void *,OMX_INDEXTYPE);
bool venc_set_config(void *configData, OMX_INDEXTYPE index);
bool venc_get_profile_level(OMX_U32 *eProfile,OMX_U32 *eLevel);
bool venc_max_allowed_bitrate_check(OMX_U32 nTargetBitrate);
bool venc_get_seq_hdr(void *, unsigned, unsigned *);
bool venc_loaded_start(void);
bool venc_loaded_stop(void);
bool venc_loaded_start_done(void);
bool venc_loaded_stop_done(void);
bool venc_get_uncache_flag(void);
OMX_U32 m_nDriver_fd;
bool m_profile_set;
bool m_level_set;
pthread_mutex_t loaded_start_stop_mlock;
pthread_cond_t loaded_start_stop_cond;

struct recon_buffer {
unsigned char* virtual_address;
int pmem_fd;
int size;
int alignment;
int offset;
#ifdef USE_ION
int ion_device_fd;
struct ion_allocation_data alloc_data;
struct ion_fd_data ion_alloc_fd;
#endif
};

recon_buffer recon_buff[MAX_RECON_BUFFERS];
int recon_buffers_count;
bool m_max_allowed_bitrate_check;
int m_eProfile;
int m_eLevel;
int etb_count;
bool m_use_uncache_buffers;

private:
class omx_venc *venc_encoder;
struct venc_basecfg m_sVenc_cfg;
struct venc_ratectrlcfg rate_ctrl;
struct venc_targetbitrate bitrate;
struct venc_intraperiod intra_period;
struct venc_profile codec_profile;
struct ven_profilelevel profile_level;
struct venc_switch set_param;
struct venc_voptimingcfg time_inc;
struct venc_allocatorproperty m_sInput_buff_property;
struct venc_allocatorproperty m_sOutput_buff_property;
struct venc_sessionqp session_qp;
struct venc_qprange qp_range;
struct venc_multiclicecfg multislice;
struct venc_entropycfg entropy;
struct venc_dbcfg dbkfilter;
struct venc_intrarefresh intra_refresh;
struct venc_headerextension hec;
struct venc_voptimingcfg voptimecfg;
struct venc_seqheader seqhdr;

bool venc_set_profile_level(OMX_U32 eProfile,OMX_U32 eLevel);
bool venc_set_intra_period(OMX_U32 nPFrames, OMX_U32 nBFrames);
bool venc_set_target_bitrate(OMX_U32 nTargetBitrate, OMX_U32 config);
bool venc_set_ratectrl_cfg(OMX_VIDEO_CONTROLRATETYPE eControlRate);
bool venc_set_session_qp(OMX_U32 i_frame_qp, OMX_U32 p_frame_qp);
bool venc_set_qp_range(OMX_U32 min_qp, OMX_U32 max_qp);
bool venc_set_extradata(OMX_U32 extra_data);
bool venc_set_encode_framerate(OMX_U32 encode_framerate, OMX_U32 config);
bool venc_set_intra_vop_refresh(OMX_BOOL intra_vop_refresh);
bool venc_set_color_format(OMX_COLOR_FORMATTYPE color_format);
bool venc_validate_profile_level(OMX_U32 *eProfile, OMX_U32 *eLevel);
bool venc_set_multislice_cfg(OMX_INDEXTYPE codec, OMX_U32 slicesize);
bool venc_set_entropy_config(OMX_BOOL enable, OMX_U32 i_cabac_level);
bool venc_set_inloop_filter(OMX_VIDEO_AVCLOOPFILTERTYPE loop_filter);
bool venc_set_intra_refresh (OMX_VIDEO_INTRAREFRESHTYPE intrarefresh, OMX_U32 nMBs);
bool venc_set_error_resilience(OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE* error_resilience);
bool venc_set_voptiming_cfg(OMX_U32 nTimeIncRes);
void venc_config_print();
bool venc_set_slice_delivery_mode(OMX_BOOL enable);
bool venc_set_inband_video_header(OMX_BOOL enable);
bool venc_set_bitstream_restrict_in_vui(OMX_BOOL enable);
bool venc_set_picture_order_count_type(OMX_U32 type);

#ifdef MAX_RES_1080P
OMX_U32 pmem_free();
OMX_U32 pmem_allocate(OMX_U32 size, OMX_U32 alignment, OMX_U32 count);
OMX_U32 venc_allocate_recon_buffers();
inline int clip2(int x)
{
x = x -1;
x = x | x >> 1;
x = x | x >> 2;
x = x | x >> 4;
x = x | x >> 16;
x = x + 1;
return x;
}
#endif
};

#endif
Loading

0 comments on commit 6154397

Please sign in to comment.