MediaCodecVideoEncoder, set timestamp on the encoder surface when drawing a texture.

MediaCodecVideoEncoder, set timestamp on the encoder surface when drawing a texture.

BUG=webrtc:4993
Committed: https://crrev.com/48477c1c6a6e4f70dd3a4a559b5235108f8709ed
Cr-Commit-Position: refs/heads/master@{#11078}

[perkj_webrtc, 2015-12-15 13:01:50]

perkj@webrtc.org changed reviewers:
+ magjed@webrtc.org

[perkj_webrtc, 2015-12-15 13:01:51]

Please?

[magjed_webrtc, 2015-12-16 13:51:53]

https://codereview.webrtc.org/1523843006/diff/1/talk/app/webrtc/java/android/...
File talk/app/webrtc/java/android/org/webrtc/EglBase.java (right):

https://codereview.webrtc.org/1523843006/diff/1/talk/app/webrtc/java/android/...
talk/app/webrtc/java/android/org/webrtc/EglBase.java:128: public abstract void
swapBuffers(long timeStampNs);
I think this should not be in the general interface if it is only supported for
EGL14.

https://codereview.webrtc.org/1523843006/diff/1/talk/app/webrtc/java/android/...
File talk/app/webrtc/java/android/org/webrtc/EglBase10.java (right):

https://codereview.webrtc.org/1523843006/diff/1/talk/app/webrtc/java/android/...
talk/app/webrtc/java/android/org/webrtc/EglBase10.java:263: public void
swapBuffers(long timeStampNs) {
ditto - Remove this. It should never be called, right?

https://codereview.webrtc.org/1523843006/diff/1/talk/app/webrtc/java/android/...
File talk/app/webrtc/java/android/org/webrtc/EglBase14.java (right):

https://codereview.webrtc.org/1523843006/diff/1/talk/app/webrtc/java/android/...
talk/app/webrtc/java/android/org/webrtc/EglBase14.java:49: private static final
int EGL14_SDK_VERSION = android.os.Build.VERSION_CODES.JELLY_BEAN_MR2;
It's not EGL14_SDK_VERSION anymore. I guess this is based on EGLExt_SDK_VERSION
now?

https://codereview.webrtc.org/1523843006/diff/1/talk/app/webrtc/java/src/org/...
File talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java (right):

https://codereview.webrtc.org/1523843006/diff/1/talk/app/webrtc/java/src/org/...
talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java:78: private
EglBase eglBase;
EglBase14.

https://codereview.webrtc.org/1523843006/diff/1/talk/app/webrtc/java/src/org/...
talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java:271:
EglBase.Context sharedContext) {
EglBase14.Context

https://codereview.webrtc.org/1523843006/diff/1/talk/app/webrtc/java/src/org/...
talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java:388:
eglBase.swapBuffers(presentationTimestampUs * nsPerUs);
Use TimeUnit.MICROSECONDS.toNanos(presentationTimestampUs).

[perkj_webrtc, 2015-12-16 21:18:45]

ptal

https://codereview.webrtc.org/1523843006/diff/1/talk/app/webrtc/java/android/...
File talk/app/webrtc/java/android/org/webrtc/EglBase.java (right):

https://codereview.webrtc.org/1523843006/diff/1/talk/app/webrtc/java/android/...
talk/app/webrtc/java/android/org/webrtc/EglBase.java:128: public abstract void
swapBuffers(long timeStampNs);
On 2015/12/16 13:51:52, magjed_webrtc wrote:
> I think this should not be in the general interface if it is only supported
for
> EGL14.

Done.

https://codereview.webrtc.org/1523843006/diff/1/talk/app/webrtc/java/android/...
File talk/app/webrtc/java/android/org/webrtc/EglBase10.java (right):

https://codereview.webrtc.org/1523843006/diff/1/talk/app/webrtc/java/android/...
talk/app/webrtc/java/android/org/webrtc/EglBase10.java:263: public void
swapBuffers(long timeStampNs) {
On 2015/12/16 13:51:53, magjed_webrtc wrote:
> ditto - Remove this. It should never be called, right?

Done.

https://codereview.webrtc.org/1523843006/diff/1/talk/app/webrtc/java/android/...
File talk/app/webrtc/java/android/org/webrtc/EglBase14.java (right):

https://codereview.webrtc.org/1523843006/diff/1/talk/app/webrtc/java/android/...
talk/app/webrtc/java/android/org/webrtc/EglBase14.java:49: private static final
int EGL14_SDK_VERSION = android.os.Build.VERSION_CODES.JELLY_BEAN_MR2;
On 2015/12/16 13:51:53, magjed_webrtc wrote:
> It's not EGL14_SDK_VERSION anymore. I guess this is based on
EGLExt_SDK_VERSION
> now?

Done.

https://codereview.webrtc.org/1523843006/diff/1/talk/app/webrtc/java/src/org/...
File talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java (right):

https://codereview.webrtc.org/1523843006/diff/1/talk/app/webrtc/java/src/org/...
talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java:78: private
EglBase eglBase;
On 2015/12/16 13:51:53, magjed_webrtc wrote:
> EglBase14.

Done.

https://codereview.webrtc.org/1523843006/diff/1/talk/app/webrtc/java/src/org/...
talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java:271:
EglBase.Context sharedContext) {
On 2015/12/16 13:51:53, magjed_webrtc wrote:
> EglBase14.Context

Done.

https://codereview.webrtc.org/1523843006/diff/1/talk/app/webrtc/java/src/org/...
talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java:388:
eglBase.swapBuffers(presentationTimestampUs * nsPerUs);
On 2015/12/16 13:51:53, magjed_webrtc wrote:
> Use TimeUnit.MICROSECONDS.toNanos(presentationTimestampUs).

Done.

[magjed_webrtc, 2015-12-17 12:20:02]

https://codereview.webrtc.org/1523843006/diff/40001/talk/app/webrtc/java/andr...
File talk/app/webrtc/java/android/org/webrtc/EglBase14.java (right):

https://codereview.webrtc.org/1523843006/diff/40001/talk/app/webrtc/java/andr...
talk/app/webrtc/java/android/org/webrtc/EglBase14.java:56: public static boolean
isEGL14Supported() {
This name is also a bit strange. BTW, do you really have to change the supported
SKD version? Why is it a problem if we use EGL14 for API 17, even if the encoder
will not be supported at this level?

https://codereview.webrtc.org/1523843006/diff/40001/talk/app/webrtc/java/jni/...
File talk/app/webrtc/java/jni/peerconnection_jni.cc (right):

https://codereview.webrtc.org/1523843006/diff/40001/talk/app/webrtc/java/jni/...
talk/app/webrtc/java/jni/peerconnection_jni.cc:1361: JOW(void,
PeerConnectionFactory_nativeSetVideoHwAccelerationOptions)(
Will this function be called even when HW encoder is not supported? If it is
only called when HW encoder is supported, I would prefer to
CHECK(jni->IsInstanceOf(local_egl_context, j_eglbase14_context_class)).

[perkj_webrtc, 2015-12-17 14:11:13]

Please

https://codereview.webrtc.org/1523843006/diff/40001/talk/app/webrtc/java/andr...
File talk/app/webrtc/java/android/org/webrtc/EglBase14.java (right):

https://codereview.webrtc.org/1523843006/diff/40001/talk/app/webrtc/java/andr...
talk/app/webrtc/java/android/org/webrtc/EglBase14.java:56: public static boolean
isEGL14Supported() {
On 2015/12/17 12:20:02, magjed_webrtc wrote:
> This name is also a bit strange. BTW, do you really have to change the
supported
> SKD version? Why is it a problem if we use EGL14 for API 17, even if the
encoder
> will not be supported at this level?

AS we talked about off line. Added a comment.

https://codereview.webrtc.org/1523843006/diff/40001/talk/app/webrtc/java/jni/...
File talk/app/webrtc/java/jni/peerconnection_jni.cc (right):

https://codereview.webrtc.org/1523843006/diff/40001/talk/app/webrtc/java/jni/...
talk/app/webrtc/java/jni/peerconnection_jni.cc:1361: JOW(void,
PeerConnectionFactory_nativeSetVideoHwAccelerationOptions)(
On 2015/12/17 12:20:02, magjed_webrtc wrote:
> Will this function be called even when HW encoder is not supported? If it is
> only called when HW encoder is supported, I would prefer to
> CHECK(jni->IsInstanceOf(local_egl_context, j_eglbase14_context_class)).

It is a public methods so we don't know what the API user do. ApprtdDemo call
this regardless of SDK version or if a codec is supported.

[magjed_webrtc, 2015-12-17 14:29:58]

lgtm

[perkj_webrtc, 2015-12-17 15:03:33]

The CQ bit was checked by perkj@webrtc.org

[commit-bot: I haz the power, 2015-12-17 15:03:47]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1523843006/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1523843006/60001

[commit-bot: I haz the power, 2015-12-17 17:04:14]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-12-17 17:04:15]

Try jobs failed on following builders:
  android_arm64_rel on tryserver.webrtc (JOB_TIMED_OUT, no build URL)

[perkj_webrtc, 2015-12-18 08:33:07]

The CQ bit was checked by perkj@webrtc.org

[commit-bot: I haz the power, 2015-12-18 08:33:20]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1523843006/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1523843006/60001

[commit-bot: I haz the power, 2015-12-18 08:34:40]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2015-12-18 08:34:46]

Description was changed from

==========
MediaCodecVideoEncoder, set timestamp on the encoder surface when drawing a
texture.

BUG=webrtc:4993
==========

to

==========
MediaCodecVideoEncoder, set timestamp on the encoder surface when drawing a
texture.

BUG=webrtc:4993

Committed: https://crrev.com/48477c1c6a6e4f70dd3a4a559b5235108f8709ed
Cr-Commit-Position: refs/heads/master@{#11078}
==========

[commit-bot: I haz the power, 2015-12-18 08:34:47]

Patchset 4 (id:??) landed as
https://crrev.com/48477c1c6a6e4f70dd3a4a559b5235108f8709ed
Cr-Commit-Position: refs/heads/master@{#11078}