Merge changes I7ea9f150,Idd98a522

* changes:
  CCodec: Episode VI --- Set Persistent Surface
  CCodec: isolate input surface buffer passing from CCodec