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

Media: Video Segmentation Prototype #12335

Merged
merged 57 commits into from
Oct 13, 2022
Merged

Media: Video Segmentation Prototype #12335

merged 57 commits into from
Oct 13, 2022

Commits on Sep 22, 2022

  1. ffmpeg function to segment a video

    @timarney
    timarney committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    addcf91 View commit details
    Browse the repository at this point in the history

  2. Update packages/story-editor/src/components/panels/design/videoSegmen… 

    …t/videoSegment.js

Co-authored-by: Jonny Harris <spacedmonkey@users.noreply.github.com>
    @timarney @spacedmonkey
    timarney and spacedmonkey committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    8d5dc0a View commit details
    Browse the repository at this point in the history

  3. Update packages/story-editor/src/components/panels/design/videoSegmen… 

    …t/videoSegment.js

Co-authored-by: Jonny Harris <spacedmonkey@users.noreply.github.com>
    @timarney @spacedmonkey
    timarney and spacedmonkey committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    343a3e3 View commit details
    Browse the repository at this point in the history

  4. remove console log

    @timarney
    timarney committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    388c0cd View commit details
    Browse the repository at this point in the history

  5. update ui checks

    @timarney
    timarney committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    50e467b View commit details
    Browse the repository at this point in the history

  6. remove bad commit

    @timarney
    timarney committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    c7007fa View commit details
    Browse the repository at this point in the history

  7. Update packages/story-editor/src/components/panels/design/videoSegmen… 

    …t/videoSegment.js

Co-authored-by: Pascal Birchler <pascalb@google.com>
    @timarney @swissspidy
    timarney and swissspidy committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    4de45e1 View commit details
    Browse the repository at this point in the history

  8. cleanup

    @timarney
    timarney committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    9b67d5d View commit details
    Browse the repository at this point in the history

  9. update majorStep

    @timarney
    timarney committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    70197f0 View commit details
    Browse the repository at this point in the history

  10. cleanup

    @timarney
    timarney committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    cd0fcfb View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2022

  1. wip refactor

    @timarney
    timarney committed Sep 23, 2022
    Configuration menu
    Copy the full SHA
    f4b625b View commit details
    Browse the repository at this point in the history

  2. fix prop name

    @timarney
    timarney committed Sep 23, 2022
    Configuration menu
    Copy the full SHA
    ba6540a View commit details
    Browse the repository at this point in the history

  3. Update packages/story-editor/src/app/media/useUploadMedia.js 

    Co-authored-by: Pascal Birchler <pascalb@google.com>
    @timarney @swissspidy
    timarney and swissspidy committed Sep 23, 2022
    Configuration menu
    Copy the full SHA
    ff8088d View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2022

  1. temp commit

    @timarney
    timarney committed Sep 24, 2022
    Configuration menu
    Copy the full SHA
    d50b7ef View commit details
    Browse the repository at this point in the history

  2. merge

    @timarney
    timarney committed Sep 24, 2022
    Configuration menu
    Copy the full SHA
    09733f8 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2022

  1. Merge branch 'main' into fix/12164-video-segmentation

    @spacedmonkey
    spacedmonkey committed Sep 26, 2022
    Configuration menu
    Copy the full SHA
    83c29d8 View commit details
    Browse the repository at this point in the history

  2. add page id + no select

    @timarney
    timarney committed Sep 26, 2022
    Configuration menu
    Copy the full SHA
    4debf56 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'temp-fix' into fix/12164-video-segmentation

    @timarney
    timarney committed Sep 26, 2022
    Configuration menu
    Copy the full SHA
    8ee13a0 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2022

  1. clean

    @timarney
    timarney committed Sep 27, 2022
    Configuration menu
    Copy the full SHA
    d48cf19 View commit details
    Browse the repository at this point in the history

  2. force keyframes

    @timarney
    timarney committed Sep 27, 2022
    Configuration menu
    Copy the full SHA
    4e78f0a View commit details
    Browse the repository at this point in the history

  3. temp commit

    @timarney
    timarney committed Sep 27, 2022
    Configuration menu
    Copy the full SHA
    801388d View commit details
    Browse the repository at this point in the history

  4. pull from right prop

    @timarney
    timarney committed Sep 27, 2022
    Configuration menu
    Copy the full SHA
    f1871fa View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2022

  1. Merge branch 'main' into fix/12164-video-segmentation

    @timarney
    timarney committed Sep 28, 2022
    Configuration menu
    Copy the full SHA
    6741e83 View commit details
    Browse the repository at this point in the history

  2. swap to force keyframes

    @timarney
    timarney committed Sep 28, 2022
    Configuration menu
    Copy the full SHA
    bc5e6ae View commit details
    Browse the repository at this point in the history

  3. add try catch

    @timarney
    timarney committed Sep 28, 2022
    Configuration menu
    Copy the full SHA
    d7cd778 View commit details
    Browse the repository at this point in the history

  4. remove additionalData from finishUploading

    @timarney
    timarney committed Sep 28, 2022
    Configuration menu
    Copy the full SHA
    b3531bc View commit details
    Browse the repository at this point in the history

  5. revert reducer

    @timarney
    timarney committed Sep 28, 2022
    Configuration menu
    Copy the full SHA
    b2ea3a5 View commit details
    Browse the repository at this point in the history

  6. move to useEffect + state

    @timarney
    timarney committed Sep 28, 2022
    Configuration menu
    Copy the full SHA
    3d0dfc2 View commit details
    Browse the repository at this point in the history

  7. batch count + useEffect

    @timarney
    timarney committed Sep 28, 2022
    Configuration menu
    Copy the full SHA
    5e7502c View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2022

  1. Merge branch 'main' into fix/12164-video-segmentation

    @timarney
    timarney committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    934eca0 View commit details
    Browse the repository at this point in the history

  2. Undo code deletion

    @swissspidy
    swissspidy committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    3876ed4 View commit details
    Browse the repository at this point in the history

  3. Return & use batchId

    @swissspidy
    swissspidy committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    2d16d15 View commit details
    Browse the repository at this point in the history

  4. Fix slider max value

    @swissspidy
    swissspidy committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    b80be2d View commit details
    Browse the repository at this point in the history

  5. Fixes #12377 

    Add check for `window.MediaInfo`
    @swissspidy
    swissspidy committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    d4dfd4e View commit details
    Browse the repository at this point in the history

  6. Add new story reducer for adding video segments

    @swissspidy
    swissspidy committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    ffb2caa View commit details
    Browse the repository at this point in the history

  7. Fix insertion and use correct batch ID

    @swissspidy
    swissspidy committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    0e309b8 View commit details
    Browse the repository at this point in the history

  8. Fix actions payload params

    @swissspidy
    swissspidy committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    a7b1c5c View commit details
    Browse the repository at this point in the history

  9. remove empty comment

    @timarney
    timarney committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    35c68ea View commit details
    Browse the repository at this point in the history

  10. update add page within bounds

    @timarney
    timarney committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    13f1833 View commit details
    Browse the repository at this point in the history

  11. addPage test

    @timarney
    timarney committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    f35929b View commit details
    Browse the repository at this point in the history

  12. add isBatchUploading expect

    @timarney
    timarney committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    d5f5a16 View commit details
    Browse the repository at this point in the history

  13. add elements tests

    @timarney
    timarney committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    ac559dc View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2022

  1. fix test payload

    @timarney
    timarney committed Sep 30, 2022
    Configuration menu
    Copy the full SHA
    6a73ca1 View commit details
    Browse the repository at this point in the history

  2. remove space

    @timarney
    timarney committed Sep 30, 2022
    Configuration menu
    Copy the full SHA
    d283d86 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into fix/12164-video-segmentation

    @timarney
    timarney committed Sep 30, 2022
    Configuration menu
    Copy the full SHA
    8a3b410 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into fix/12164-video-segmentation

    @timarney
    timarney committed Sep 30, 2022
    Configuration menu
    Copy the full SHA
    4e895bb View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2022

  1. add isBatchUploading

    @timarney
    timarney committed Oct 1, 2022
    Configuration menu
    Copy the full SHA
    1a7e854 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2022

  1. Merge branch 'main' into fix/12164-video-segmentation

    @timarney
    timarney committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    8570534 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into fix/12164-video-segmentation

    @timarney
    timarney committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    f08c73c View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2022

  1. Merge branch 'main' into fix/12164-video-segmentation

    @timarney
    timarney committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    169b095 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into fix/12164-video-segmentation

    @timarney
    timarney committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    43f2718 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2022

  1. Merge branch 'main' into fix/12164-video-segmentation

    @timarney
    timarney committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    9e4d572 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2022

  1. Merge branch 'main' into fix/12164-video-segmentation

    @timarney
    timarney committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    d873a1c View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2022

  1. Merge branch 'main' into fix/12164-video-segmentation

    @timarney
    timarney committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    666c834 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2022

  1. add todo

    @timarney
    timarney committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    2779003 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into fix/12164-video-segmentation

    @timarney
    timarney committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    a076409 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into fix/12164-video-segmentation

    @timarney
    timarney committed Oct 13, 2022
    Configuration menu
    Copy the full SHA
    5fd476f View commit details
    Browse the repository at this point in the history