Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add a realtimeStreaming example #1659

Merged
merged 16 commits into from
Jun 11, 2021
Merged

add a realtimeStreaming example #1659

merged 16 commits into from
Jun 11, 2021

Commits on Jun 4, 2021

  1. add a realtimeStreaming example

    wangxi3 committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    89d952c View commit details
    Browse the repository at this point in the history

  2. add atFrame Option to grabber

    wangxi3 committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    9b6e4ce View commit details
    Browse the repository at this point in the history

  3. use "re" option add global real time grab 

    like ffmpeg
    wangxi3 committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    6838c85 View commit details
    Browse the repository at this point in the history

  4. add two unit test for realtime change

    wangxi3 committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    c93de18 View commit details
    Browse the repository at this point in the history

  5. fix the test bug

    wangxi3 committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    e3e33a7 View commit details
    Browse the repository at this point in the history

  6. remove atFrameRate from grab() 

    remove "re" check from startUnsafe()
add a atFrameRate field
    wangxi committed Jun 4, 2021
    Configuration menu
    Copy the full SHA
    415f84f View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2021

  1. add grabAtFrameRate to FrameGrabber.java

    wangxi3 committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    2038bcc View commit details
    Browse the repository at this point in the history

  2. remove unused import

    wangxi3 committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    9fe0836 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/f_realtimeStreaming' into f_real… 

    …timeStreaming

# Conflicts:
#	platform/src/test/java/org/bytedeco/javacv/FrameGrabberRealTimeTest.java
    wangxi3 committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    2bdf3bb View commit details
    Browse the repository at this point in the history

  4. Revert "remove atFrameRate from grab() remove "re" check from startUn… 

    …safe() add a atFrameRate field"

This reverts commit 415f84f
    wangxi3 committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    b74706d View commit details
    Browse the repository at this point in the history

  5. Revert "use "re" option add global real time grab like ffmpeg" 

    This reverts commit 6838c85
    wangxi3 committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    b97799c View commit details
    Browse the repository at this point in the history

  6. Revert "add atFrame Option to grabber" 

    This reverts commit 9b6e4ce
    wangxi3 committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    81223ee View commit details
    Browse the repository at this point in the history

  7. Revert "add a realtimeStreaming example" 

    This reverts commit 89d952c
    wangxi3 committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    40406b5 View commit details
    Browse the repository at this point in the history

  8. remove something

    wangxi3 committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    49024a2 View commit details
    Browse the repository at this point in the history

  9. 1

    wangxi3 committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    5f62a4f View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2021

  1. Update CHANGELOG.md, extract waitForTimestamp() from grabAtFrameRate(… 

    …), enhance test, and fix nits
    @saudet
    saudet committed Jun 11, 2021
    Configuration menu
    Copy the full SHA
    339f51d View commit details
    Browse the repository at this point in the history