| author | Rico Yang <wei.yang@amlogic.com> | 2020-08-02 17:12:16 (GMT) |
|---|---|---|
| committer | gerrit autosubmit <gerrit.autosubmit@scgit.amlogic.com> | 2020-08-03 13:14:47 (GMT) |
| commit | 989a9bc31f92f69920c14127330f574bf0ebe7f9 (patch) | |
| tree | a2f2249af81866d9e95883771bf23bc3921f9b60 | |
| parent | 9b8c972a3daa492a462bb166aef3ae3928fa82d4 (diff) | |
| download | media_modules-amlogic-4.9-dev-q.zip media_modules-amlogic-4.9-dev-q.tar.gz media_modules-amlogic-4.9-dev-q.tar.bz2 | |
media_modules: make h264 encoder compatible with older socs [1/1]
PD#SWPL-25846
Problem:
h264 encoder not working on old socs pre-sc2
Solution:
make h264 encoder compatible with older socs
Verify:
verified on franklin
Change-Id: I1ddbea32748069be06ee344ec1dbf8987a5b350b
Signed-off-by: Rico Yang <wei.yang@amlogic.com>
| -rw-r--r-- | drivers/frame_sink/encoder/h264/encoder.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/frame_sink/encoder/h264/encoder.c b/drivers/frame_sink/encoder/h264/encoder.c index 66a3f6c..9421b93 100644 --- a/drivers/frame_sink/encoder/h264/encoder.c +++ b/drivers/frame_sink/encoder/h264/encoder.c @@ -4496,11 +4496,13 @@ static s32 amvenc_avc_probe(struct platform_device *pdev) #endif } - if (hcodec_clk_prepare(&pdev->dev, &s_hcodec_clks)) { - //err = -ENOENT; - enc_pr(LOG_ERROR, "[%s:%d] probe hcodec enc failed\n", __FUNCTION__, __LINE__); - //goto ERROR_PROBE_DEVICE; - return -EINVAL; + if (get_cpu_type() >= MESON_CPU_MAJOR_ID_SC2) { + if (hcodec_clk_prepare(&pdev->dev, &s_hcodec_clks)) { + //err = -ENOENT; + enc_pr(LOG_ERROR, "[%s:%d] probe hcodec enc failed\n", __FUNCTION__, __LINE__); + //goto ERROR_PROBE_DEVICE; + return -EINVAL; + } } if (get_cpu_type() >= MESON_CPU_MAJOR_ID_SC2) { |