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.

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

Add controls for DeinterlaceMethod #968

Merged
merged 4 commits into from
Apr 6, 2020
Merged

Conversation

alset333
Copy link
Contributor

Add controls and US-English text for DeinterlaceMethod in encodingsettings. Uses the values referenced here: jellyfin/jellyfin#2639

Changes

  • Add a section to EncodingSettings to control DeinterlaceMethod.
  • Add en-us text for aforementioned new section.

Add controls and US-English text for DeinterlaceMethod in encodingsettings. Uses the values referenced here jellyfin/jellyfin#2639
@dkanada
Copy link
Member

dkanada commented Mar 31, 2020

@alset333 is this ready for review?

@alset333 alset333 marked this pull request as ready for review April 5, 2020 03:36
@alset333
Copy link
Contributor Author

alset333 commented Apr 5, 2020

Yes, @dkanada, this should be ready for review now. The code it depends on was committed at jellyfin/jellyfin@5acd052

@dmitrylyzo
Copy link
Contributor

I don't see where selectDeinterlaceMethod option is sent to server. 😕

@heyhippari
Copy link
Contributor

heyhippari commented Apr 5, 2020

I don't see where selectDeinterlaceMethod option is sent to server. confused

Indeed, there's no getter or setter for the setting. As-is, it will do nothing but add the nonfunctioning input @alset333 .

@alset333
Copy link
Contributor Author

alset333 commented Apr 5, 2020

I don't see where selectDeinterlaceMethod option is sent to server. confused

Indeed, there's no getter or setter for the setting. As-is, it will do nothing but add the nonfunctioning input @alset333 .

Hm... I'll take another look but it seemed to be working on my end; possible I missed something with the repo.

Edit: Aw shucks you're right. Not working locally either. I think I see where I worked on it before and will try to fix. I must've deleted the changes somewhere.

@alset333 alset333 changed the title Add controls for DeinterlaceMethod [WIP/INCOMPLETE] Add controls for DeinterlaceMethod Apr 5, 2020
@alset333 alset333 changed the title [WIP/INCOMPLETE] Add controls for DeinterlaceMethod Add controls for DeinterlaceMethod Apr 5, 2020
@alset333
Copy link
Contributor Author

alset333 commented Apr 5, 2020

I think this is working correctly now. The getters and setters for "selectDeinterlaceMethod" have been added to encodingsettings.js based on the structure of "selectEncoderPreset"'s getters/setters. Now testing good on my end again; surprised I didn't catch this issue myself so thanks.

@alset333 alset333 requested a review from heyhippari April 5, 2020 21:36
Copy link
Contributor

@heyhippari heyhippari left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Supposing you tested that it does in fact change the deinterlacing method used when transcoding, it looks good on this end :)

@@ -14,6 +14,7 @@ define(["jQuery", "loading", "globalize", "dom", "libraryMenu"], function ($, lo
$("#txtVaapiDevice", page).val(config.VaapiDevice || "");
page.querySelector("#selectEncoderPreset").value = config.EncoderPreset || "";
page.querySelector("#txtH264Crf").value = config.H264Crf || "";
page.querySelector("#selectDeinterlaceMethod").value = config.DeinterlaceMethod || "";
Copy link
Contributor

@dmitrylyzo dmitrylyzo Apr 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If config.DeinterlaceMethod is not set, selectDeinterlaceMethod is empty. Should there be a default method?

Edit:
I hacked this a bit - cleared config.DeinterlaceMethod, because it was yadif. So maybe it will never be unset.

Copy link
Contributor Author

@alset333 alset333 Apr 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should always be set, the default server-side value is "yadif" per this code

We could add a default in encodingsettings, but there isn't one for most of the other settings (EncoderPreset, H264Crf, etc) which are already there.

@dkanada dkanada merged commit dea0f59 into jellyfin:master Apr 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants