1335066 - Fix logging in TrackEncoder.cpp

Status: RESOLVED FIXED

(Core :: Audio/Video: Recording, defect)

Comment 1

[Paul Adenot (:padenot)]

Attachment: Bug 1335066 - Fix logging in TrackEncoder.cpp.

This was a mix of Android logging for b2g and normal logging and also noop
logging statement. This makes everything use MOZ_LOG.

Review commit: https://reviewboard.mozilla.org/r/108276/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/108276/

Comment 2

[Andreas Pehrson [:pehrsons]]

Comment on attachment 8831722 [details]
Bug 1335066 - Fix logging in TrackEncoder.cpp.

https://reviewboard.mozilla.org/r/108276/#review109280

::: dom/media/encoder/TrackEncoder.cpp:74
(Diff revision 1)
>        // The number of channels is determined by the first non-null chunk, and
>        // thus the audio encoder is initialized at this time.
>        if (!chunk.IsNull()) {
>          nsresult rv = Init(chunk.mChannelData.Length(), aGraph->GraphRate());
>          if (NS_FAILED(rv)) {
> -          LOG("[AudioTrackEncoder]: Fail to initialize the encoder!");
> +          TRACK_LOG(LogLevel::Debug, ("[AudioTrackEncoder]: Fail to initialize the encoder!"));

This is great because we can differentiate log levels!

Let's make this one Error.

::: dom/media/encoder/TrackEncoder.cpp:87
(Diff revision 1)
>  
>      mNotInitDuration += aQueuedMedia.GetDuration();
>      if (!mInitialized &&
>          (mNotInitDuration / aGraph->GraphRate() > INIT_FAILED_DURATION) &&
>          mInitCounter > 1) {
> -      LOG("[AudioTrackEncoder]: Initialize failed for 30s.");
> +      TRACK_LOG(LogLevel::Debug, ("[AudioTrackEncoder]: Initialize failed for 30s."));

Warning

::: dom/media/encoder/TrackEncoder.cpp:99
(Diff revision 1)
>    AppendAudioSegment(audio);
>  
>  
>    // The stream has stopped and reached the end of track.
>    if (aTrackEvents == TrackEventCommand::TRACK_EVENT_ENDED) {
> -    LOG("[AudioTrackEncoder]: Receive TRACK_EVENT_ENDED .");
> +    TRACK_LOG(LogLevel::Debug, ("[AudioTrackEncoder]: Receive TRACK_EVENT_ENDED ."));

Info

::: dom/media/encoder/TrackEncoder.cpp:212
(Diff revision 1)
>       gfx::IntSize intrinsicSize = chunk.mFrame.GetIntrinsicSize();
>       nsresult rv = Init(imgsize.width, imgsize.height,
>                          intrinsicSize.width, intrinsicSize.height);
>  
>       if (NS_FAILED(rv)) {
> -       LOG("[VideoTrackEncoder]: Fail to initialize the encoder!");
> +       TRACK_LOG(LogLevel::Debug, ("[VideoTrackEncoder]: Fail to initialize the encoder!"));

Error

::: dom/media/encoder/TrackEncoder.cpp:224
(Diff revision 1)
>    }
>  
>    mNotInitDuration += aSegment.GetDuration();
>    if ((mNotInitDuration / mTrackRate > INIT_FAILED_DURATION) &&
>        mInitCounter > 1) {
> -    LOG("[VideoTrackEncoder]: Initialize failed for %ds.", INIT_FAILED_DURATION);
> +    TRACK_LOG(LogLevel::Debug, ("[VideoTrackEncoder]: Initialize failed for %ds.", INIT_FAILED_DURATION));

Warning

::: dom/media/encoder/TrackEncoder.cpp:270
(Diff revision 1)
>  
>    AppendVideoSegment(video);
>  
>    // The stream has stopped and reached the end of track.
>    if (aTrackEvents == TrackEventCommand::TRACK_EVENT_ENDED) {
> -    LOG("[VideoTrackEncoder]: Receive TRACK_EVENT_ENDED .");
> +    TRACK_LOG(LogLevel::Debug, ("[VideoTrackEncoder]: Receive TRACK_EVENT_ENDED ."));

Info

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/30293a6c6e4a
Fix logging in TrackEncoder.cpp. r=pehrsons

Comment 4

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/30293a6c6e4a