Change capture time format to nanoseconds in EncodedImage.

webrtc/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java

 /*
  *  Copyright 2017 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 62 matching lines @@
     HardwareVideoEncoderFactory factory =
         new HardwareVideoEncoderFactory(ENABLE_INTEL_VP8_ENCODER, ENABLE_H264_HIGH_PROFILE);
     VideoCodecInfo[] supportedCodecs = factory.getSupportedCodecs();
     if (supportedCodecs.length == 0) {
       Log.w(TAG, "No hardware encoding support, skipping testEncodeYuvBuffer");
       return;
     }
 
     VideoEncoder encoder = factory.createEncoder(supportedCodecs[0]);
 
-    final long presentationTimestampUs = 20000;
+    final long presentationTimestampNs = 20000;
     final CountDownLatch encodeDone = new CountDownLatch(1);
 
     VideoEncoder.Callback callback = new VideoEncoder.Callback() {
       @Override
       public void onEncodedFrame(EncodedImage image, VideoEncoder.CodecSpecificInfo info) {
         assertTrue(image.buffer.capacity() > 0);
         assertEquals(image.encodedWidth, SETTINGS.width);
         assertEquals(image.encodedHeight, SETTINGS.height);
-        assertEquals(image.captureTimeMs, presentationTimestampUs / 1000);
+        assertEquals(image.captureTimeNs, presentationTimestampNs);
         assertEquals(image.frameType, EncodedImage.FrameType.VideoFrameKey);
         assertEquals(image.rotation, 0);
         assertTrue(image.completeFrame);
 
         encodeDone.countDown();
       }
     };
 
     assertEquals(encoder.initEncode(SETTINGS, callback), VideoCodecStatus.OK);
 
     VideoFrame.I420Buffer buffer = I420BufferImpl.allocate(SETTINGS.width, SETTINGS.height);
-    VideoFrame frame = new VideoFrame(buffer, 0 /* rotation */, presentationTimestampUs * 1000);
+    VideoFrame frame = new VideoFrame(buffer, 0 /* rotation */, presentationTimestampNs);
     VideoEncoder.EncodeInfo info = new VideoEncoder.EncodeInfo(
         new EncodedImage.FrameType[] {EncodedImage.FrameType.VideoFrameKey});
 
     assertEquals(encoder.encode(frame, info), VideoCodecStatus.OK);
 
     ThreadUtils.awaitUninterruptibly(encodeDone);
 
     assertEquals(encoder.release(), VideoCodecStatus.OK);
   }
 
   @Test
   @SmallTest
   public void testEncodeTextures() throws InterruptedException {
     final EglBase14 eglOesBase = new EglBase14(null, EglBase.CONFIG_PIXEL_BUFFER);
     HardwareVideoEncoderFactory factory = new HardwareVideoEncoderFactory(
         eglOesBase.getEglBaseContext(), ENABLE_INTEL_VP8_ENCODER, ENABLE_H264_HIGH_PROFILE);
     VideoCodecInfo[] supportedCodecs = factory.getSupportedCodecs();
     if (supportedCodecs.length == 0) {
       Log.w(TAG, "No hardware encoding support, skipping testEncodeTextures");
       return;
     }
 
     eglOesBase.createDummyPbufferSurface();
     eglOesBase.makeCurrent();
     final int oesTextureId = GlUtil.generateTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES);
 
     VideoEncoder encoder = factory.createEncoder(supportedCodecs[0]);
 
-    final long presentationTimestampUs = 20000;
+    final long presentationTimestampNs = 20000;
     final CountDownLatch encodeDone = new CountDownLatch(1);
 
     VideoEncoder.Callback callback = new VideoEncoder.Callback() {
       @Override
       public void onEncodedFrame(EncodedImage image, VideoEncoder.CodecSpecificInfo info) {
         assertTrue(image.buffer.capacity() > 0);
         assertEquals(image.encodedWidth, SETTINGS.width);
         assertEquals(image.encodedHeight, SETTINGS.height);
-        assertEquals(image.captureTimeMs, presentationTimestampUs / 1000);
+        assertEquals(image.captureTimeNs, presentationTimestampNs);
         assertEquals(image.frameType, EncodedImage.FrameType.VideoFrameKey);
         assertEquals(image.rotation, 0);
         assertTrue(image.completeFrame);
 
         encodeDone.countDown();
       }
     };
 
     assertEquals(encoder.initEncode(SETTINGS, callback), VideoCodecStatus.OK);
 
@@ skipping 33 matching lines @@
 
       @Override
       public void release() {}
 
       @Override
       public VideoFrame.Buffer cropAndScale(
           int cropX, int cropY, int cropWidth, int cropHeight, int scaleWidth, int scaleHeight) {
         return null;
       }
     };
-    VideoFrame frame = new VideoFrame(buffer, 0 /* rotation */, presentationTimestampUs * 1000);
+    VideoFrame frame = new VideoFrame(buffer, 0 /* rotation */, presentationTimestampNs);
     VideoEncoder.EncodeInfo info = new VideoEncoder.EncodeInfo(
         new EncodedImage.FrameType[] {EncodedImage.FrameType.VideoFrameKey});
 
     assertEquals(encoder.encode(frame, info), VideoCodecStatus.OK);
     GlUtil.checkNoGLES2Error("encodeTexture");
 
     // It should be Ok to delete the texture after calling encodeTexture.
     GLES20.glDeleteTextures(1, new int[] {oesTextureId}, 0);
 
     ThreadUtils.awaitUninterruptibly(encodeDone);
 
     assertEquals(encoder.release(), VideoCodecStatus.OK);
     eglOesBase.release();
   }
 }