Fix an error
Fix code
Revert "Fix code"

This reverts commit 3bb89679d1341852f1d9674c817f5817df83af45.
Test:fix code
Sync to bluewater-cn,fix Hardware decode